diff --git a/sdk/digitaltwins/azure-resourcemanager-digitaltwins/CHANGELOG.md b/sdk/digitaltwins/azure-resourcemanager-digitaltwins/CHANGELOG.md
index af87dd1c3163..5bee949fbdfa 100644
--- a/sdk/digitaltwins/azure-resourcemanager-digitaltwins/CHANGELOG.md
+++ b/sdk/digitaltwins/azure-resourcemanager-digitaltwins/CHANGELOG.md
@@ -1,7 +1,8 @@
 # Release History
 
-## 1.0.0-beta.2 (Unreleased)
+## 1.0.0-beta.1 (2021-05-10)
 
+- Azure Resource Manager AzureDigitalTwins client library for Java. This package contains Microsoft Azure SDK for AzureDigitalTwins Management SDK. Azure Digital Twins Client for managing DigitalTwinsInstance. Package tag package-2020-12. For documentation on how to use this package, please see [Azure Management Libraries for Java](https://aka.ms/azsdk/java/mgmt).
 
 ## 1.0.0-beta.1 (2021-03-02)
 
diff --git a/sdk/digitaltwins/azure-resourcemanager-digitaltwins/README.md b/sdk/digitaltwins/azure-resourcemanager-digitaltwins/README.md
index 6d26820379f8..98e64eea122c 100644
--- a/sdk/digitaltwins/azure-resourcemanager-digitaltwins/README.md
+++ b/sdk/digitaltwins/azure-resourcemanager-digitaltwins/README.md
@@ -32,7 +32,7 @@ Various documentation is available to help you get started
 <dependency>
     <groupId>com.azure.resourcemanager</groupId>
     <artifactId>azure-resourcemanager-digitaltwins</artifactId>
-    <version>1.0.0-beta.1</version>
+    <version>1.0.0-beta.2</version>
 </dependency>
 ```
 [//]: # ({x-version-update-end})
diff --git a/sdk/digitaltwins/azure-resourcemanager-digitaltwins/pom.xml b/sdk/digitaltwins/azure-resourcemanager-digitaltwins/pom.xml
index 61b88d14072a..3cc6f9a7705a 100644
--- a/sdk/digitaltwins/azure-resourcemanager-digitaltwins/pom.xml
+++ b/sdk/digitaltwins/azure-resourcemanager-digitaltwins/pom.xml
@@ -13,7 +13,7 @@
     <packaging>jar</packaging>
 
     <name>Microsoft Azure SDK for AzureDigitalTwins Management</name>
-    <description>This package contains Microsoft Azure SDK for AzureDigitalTwins Management SDK. Azure Digital Twins Client for managing DigitalTwinsInstance. Package tag package-2020-12. For documentation on how to use this package, please see https://aka.ms/azsdk/java/mgmt</description>
+    <description>This package contains Microsoft Azure SDK for AzureDigitalTwins Management SDK. For documentation on how to use this package, please see https://aka.ms/azsdk/java/mgmt. Azure Digital Twins Client for managing DigitalTwinsInstance. Package tag package-2020-12.</description>
     <url>https://github.com/Azure/azure-sdk-for-java</url>
 
     <licenses>
@@ -51,30 +51,6 @@
             <artifactId>azure-core-management</artifactId>
             <version>1.2.2</version> <!-- {x-version-update;com.azure:azure-core-management;dependency} -->
         </dependency>
-        <dependency>
-            <groupId>com.azure</groupId>
-            <artifactId>azure-identity</artifactId>
-            <version>1.2.5</version> <!-- {x-version-update;com.azure:azure-identity;dependency} -->
-            <scope>test</scope>
-        </dependency>
-        <dependency>
-            <groupId>com.azure.resourcemanager</groupId>
-            <artifactId>azure-resourcemanager-resources</artifactId>
-            <version>2.4.0</version> <!-- {x-version-update;com.azure.resourcemanager:azure-resourcemanager-resources;dependency} -->
-            <scope>test</scope>
-        </dependency>
-        <dependency>
-            <groupId>com.azure</groupId>
-            <artifactId>azure-core-test</artifactId>
-            <version>1.6.2</version> <!-- {x-version-update;com.azure:azure-core-test;dependency} -->
-            <scope>test</scope>
-        </dependency>
-        <dependency>
-            <groupId>org.slf4j</groupId>
-            <artifactId>slf4j-simple</artifactId>
-            <version>1.7.30</version> <!-- {x-version-update;org.slf4j:slf4j-simple;external_dependency} -->
-            <scope>test</scope>
-        </dependency>
     </dependencies>
     <build>
         <plugins>
diff --git a/sdk/digitaltwins/azure-resourcemanager-digitaltwins/src/main/java/com/azure/resourcemanager/digitaltwins/AzureDigitalTwinsManager.java b/sdk/digitaltwins/azure-resourcemanager-digitaltwins/src/main/java/com/azure/resourcemanager/digitaltwins/AzureDigitalTwinsManager.java
index 97d246104348..23d698e53c2f 100644
--- a/sdk/digitaltwins/azure-resourcemanager-digitaltwins/src/main/java/com/azure/resourcemanager/digitaltwins/AzureDigitalTwinsManager.java
+++ b/sdk/digitaltwins/azure-resourcemanager-digitaltwins/src/main/java/com/azure/resourcemanager/digitaltwins/AzureDigitalTwinsManager.java
@@ -201,6 +201,7 @@ public AzureDigitalTwinsManager authenticate(TokenCredential credential, AzurePr
                 .add(
                     new BearerTokenAuthenticationPolicy(
                         credential, profile.getEnvironment().getManagementEndpoint() + "/.default"));
+            policies.addAll(this.policies);
             HttpPolicyProviders.addAfterRetryPolicies(policies);
             policies.add(new HttpLoggingPolicy(httpLogOptions));
             HttpPipeline httpPipeline =
diff --git a/sdk/digitaltwins/azure-resourcemanager-digitaltwins/src/main/java/com/azure/resourcemanager/digitaltwins/fluent/models/GroupIdInformationInner.java b/sdk/digitaltwins/azure-resourcemanager-digitaltwins/src/main/java/com/azure/resourcemanager/digitaltwins/fluent/models/GroupIdInformationInner.java
index 6db04ec52cba..b14688b3abaf 100644
--- a/sdk/digitaltwins/azure-resourcemanager-digitaltwins/src/main/java/com/azure/resourcemanager/digitaltwins/fluent/models/GroupIdInformationInner.java
+++ b/sdk/digitaltwins/azure-resourcemanager-digitaltwins/src/main/java/com/azure/resourcemanager/digitaltwins/fluent/models/GroupIdInformationInner.java
@@ -16,7 +16,7 @@ public final class GroupIdInformationInner {
     @JsonIgnore private final ClientLogger logger = new ClientLogger(GroupIdInformationInner.class);
 
     /*
-     * The properties for a group information object.
+     * The properties property.
      */
     @JsonProperty(value = "properties", required = true)
     private GroupIdInformationProperties properties;
@@ -40,7 +40,7 @@ public final class GroupIdInformationInner {
     private String type;
 
     /**
-     * Get the properties property: The properties for a group information object.
+     * Get the properties property: The properties property.
      *
      * @return the properties value.
      */
@@ -49,7 +49,7 @@ public GroupIdInformationProperties properties() {
     }
 
     /**
-     * Set the properties property: The properties for a group information object.
+     * Set the properties property: The properties property.
      *
      * @param properties the properties value to set.
      * @return the GroupIdInformationInner object itself.
diff --git a/sdk/digitaltwins/azure-resourcemanager-digitaltwins/src/main/java/com/azure/resourcemanager/digitaltwins/fluent/models/PrivateEndpointConnectionInner.java b/sdk/digitaltwins/azure-resourcemanager-digitaltwins/src/main/java/com/azure/resourcemanager/digitaltwins/fluent/models/PrivateEndpointConnectionInner.java
index 4f634cdc1341..af89a37db120 100644
--- a/sdk/digitaltwins/azure-resourcemanager-digitaltwins/src/main/java/com/azure/resourcemanager/digitaltwins/fluent/models/PrivateEndpointConnectionInner.java
+++ b/sdk/digitaltwins/azure-resourcemanager-digitaltwins/src/main/java/com/azure/resourcemanager/digitaltwins/fluent/models/PrivateEndpointConnectionInner.java
@@ -7,7 +7,7 @@
 import com.azure.core.annotation.Fluent;
 import com.azure.core.management.ProxyResource;
 import com.azure.core.util.logging.ClientLogger;
-import com.azure.resourcemanager.digitaltwins.models.ConnectionProperties;
+import com.azure.resourcemanager.digitaltwins.models.PrivateEndpointConnectionProperties;
 import com.fasterxml.jackson.annotation.JsonIgnore;
 import com.fasterxml.jackson.annotation.JsonProperty;
 
@@ -17,27 +17,27 @@ public final class PrivateEndpointConnectionInner extends ProxyResource {
     @JsonIgnore private final ClientLogger logger = new ClientLogger(PrivateEndpointConnectionInner.class);
 
     /*
-     * The properties of a private endpoint connection.
+     * The properties property.
      */
     @JsonProperty(value = "properties", required = true)
-    private ConnectionProperties properties;
+    private PrivateEndpointConnectionProperties properties;
 
     /**
-     * Get the properties property: The properties of a private endpoint connection.
+     * Get the properties property: The properties property.
      *
      * @return the properties value.
      */
-    public ConnectionProperties properties() {
+    public PrivateEndpointConnectionProperties properties() {
         return this.properties;
     }
 
     /**
-     * Set the properties property: The properties of a private endpoint connection.
+     * Set the properties property: The properties property.
      *
      * @param properties the properties value to set.
      * @return the PrivateEndpointConnectionInner object itself.
      */
-    public PrivateEndpointConnectionInner withProperties(ConnectionProperties properties) {
+    public PrivateEndpointConnectionInner withProperties(PrivateEndpointConnectionProperties properties) {
         this.properties = properties;
         return this;
     }
diff --git a/sdk/digitaltwins/azure-resourcemanager-digitaltwins/src/main/java/com/azure/resourcemanager/digitaltwins/implementation/CheckNameResultImpl.java b/sdk/digitaltwins/azure-resourcemanager-digitaltwins/src/main/java/com/azure/resourcemanager/digitaltwins/implementation/CheckNameResultImpl.java
index f353ff6c4c55..4dfb86b9b1b3 100644
--- a/sdk/digitaltwins/azure-resourcemanager-digitaltwins/src/main/java/com/azure/resourcemanager/digitaltwins/implementation/CheckNameResultImpl.java
+++ b/sdk/digitaltwins/azure-resourcemanager-digitaltwins/src/main/java/com/azure/resourcemanager/digitaltwins/implementation/CheckNameResultImpl.java
@@ -4,7 +4,6 @@
 
 package com.azure.resourcemanager.digitaltwins.implementation;
 
-import com.azure.resourcemanager.digitaltwins.AzureDigitalTwinsManager;
 import com.azure.resourcemanager.digitaltwins.fluent.models.CheckNameResultInner;
 import com.azure.resourcemanager.digitaltwins.models.CheckNameResult;
 import com.azure.resourcemanager.digitaltwins.models.Reason;
@@ -12,9 +11,11 @@
 public final class CheckNameResultImpl implements CheckNameResult {
     private CheckNameResultInner innerObject;
 
-    private final AzureDigitalTwinsManager serviceManager;
+    private final com.azure.resourcemanager.digitaltwins.AzureDigitalTwinsManager serviceManager;
 
-    CheckNameResultImpl(CheckNameResultInner innerObject, AzureDigitalTwinsManager serviceManager) {
+    CheckNameResultImpl(
+        CheckNameResultInner innerObject,
+        com.azure.resourcemanager.digitaltwins.AzureDigitalTwinsManager serviceManager) {
         this.innerObject = innerObject;
         this.serviceManager = serviceManager;
     }
@@ -35,7 +36,7 @@ public CheckNameResultInner innerModel() {
         return this.innerObject;
     }
 
-    private AzureDigitalTwinsManager manager() {
+    private com.azure.resourcemanager.digitaltwins.AzureDigitalTwinsManager manager() {
         return this.serviceManager;
     }
 }
diff --git a/sdk/digitaltwins/azure-resourcemanager-digitaltwins/src/main/java/com/azure/resourcemanager/digitaltwins/implementation/DigitalTwinsClientImpl.java b/sdk/digitaltwins/azure-resourcemanager-digitaltwins/src/main/java/com/azure/resourcemanager/digitaltwins/implementation/DigitalTwinsClientImpl.java
index d208510051d9..759273fe178c 100644
--- a/sdk/digitaltwins/azure-resourcemanager-digitaltwins/src/main/java/com/azure/resourcemanager/digitaltwins/implementation/DigitalTwinsClientImpl.java
+++ b/sdk/digitaltwins/azure-resourcemanager-digitaltwins/src/main/java/com/azure/resourcemanager/digitaltwins/implementation/DigitalTwinsClientImpl.java
@@ -240,7 +240,7 @@ private Mono<Response<DigitalTwinsDescriptionInner>> getByResourceGroupWithRespo
                             resourceName,
                             accept,
                             context))
-            .subscriberContext(context -> context.putAll(FluxUtil.toReactorContext(this.client.getContext())));
+            .contextWrite(context -> context.putAll(FluxUtil.toReactorContext(this.client.getContext()).readOnly()));
     }
 
     /**
@@ -399,7 +399,7 @@ private Mono<Response<Flux<ByteBuffer>>> createOrUpdateWithResponseAsync(
                             digitalTwinsCreate,
                             accept,
                             context))
-            .subscriberContext(context -> context.putAll(FluxUtil.toReactorContext(this.client.getContext())));
+            .contextWrite(context -> context.putAll(FluxUtil.toReactorContext(this.client.getContext()).readOnly()));
     }
 
     /**
@@ -707,7 +707,7 @@ private Mono<Response<Flux<ByteBuffer>>> updateWithResponseAsync(
                             digitalTwinsPatchDescription,
                             accept,
                             context))
-            .subscriberContext(context -> context.putAll(FluxUtil.toReactorContext(this.client.getContext())));
+            .contextWrite(context -> context.putAll(FluxUtil.toReactorContext(this.client.getContext()).readOnly()));
     }
 
     /**
@@ -988,7 +988,7 @@ private Mono<Response<Flux<ByteBuffer>>> deleteWithResponseAsync(String resource
                             resourceName,
                             accept,
                             context))
-            .subscriberContext(context -> context.putAll(FluxUtil.toReactorContext(this.client.getContext())));
+            .contextWrite(context -> context.putAll(FluxUtil.toReactorContext(this.client.getContext()).readOnly()));
     }
 
     /**
@@ -1226,7 +1226,7 @@ private Mono<PagedResponse<DigitalTwinsDescriptionInner>> listSinglePageAsync()
                         res.getValue().value(),
                         res.getValue().nextLink(),
                         null))
-            .subscriberContext(context -> context.putAll(FluxUtil.toReactorContext(this.client.getContext())));
+            .contextWrite(context -> context.putAll(FluxUtil.toReactorContext(this.client.getContext()).readOnly()));
     }
 
     /**
@@ -1374,7 +1374,7 @@ private Mono<PagedResponse<DigitalTwinsDescriptionInner>> listByResourceGroupSin
                         res.getValue().value(),
                         res.getValue().nextLink(),
                         null))
-            .subscriberContext(context -> context.putAll(FluxUtil.toReactorContext(this.client.getContext())));
+            .contextWrite(context -> context.putAll(FluxUtil.toReactorContext(this.client.getContext()).readOnly()));
     }
 
     /**
@@ -1540,7 +1540,7 @@ private Mono<Response<CheckNameResultInner>> checkNameAvailabilityWithResponseAs
                             digitalTwinsInstanceCheckName,
                             accept,
                             context))
-            .subscriberContext(context -> context.putAll(FluxUtil.toReactorContext(this.client.getContext())));
+            .contextWrite(context -> context.putAll(FluxUtil.toReactorContext(this.client.getContext()).readOnly()));
     }
 
     /**
@@ -1685,7 +1685,7 @@ private Mono<PagedResponse<DigitalTwinsDescriptionInner>> listNextSinglePageAsyn
                         res.getValue().value(),
                         res.getValue().nextLink(),
                         null))
-            .subscriberContext(context -> context.putAll(FluxUtil.toReactorContext(this.client.getContext())));
+            .contextWrite(context -> context.putAll(FluxUtil.toReactorContext(this.client.getContext()).readOnly()));
     }
 
     /**
@@ -1758,7 +1758,7 @@ private Mono<PagedResponse<DigitalTwinsDescriptionInner>> listByResourceGroupNex
                         res.getValue().value(),
                         res.getValue().nextLink(),
                         null))
-            .subscriberContext(context -> context.putAll(FluxUtil.toReactorContext(this.client.getContext())));
+            .contextWrite(context -> context.putAll(FluxUtil.toReactorContext(this.client.getContext()).readOnly()));
     }
 
     /**
diff --git a/sdk/digitaltwins/azure-resourcemanager-digitaltwins/src/main/java/com/azure/resourcemanager/digitaltwins/implementation/DigitalTwinsDescriptionImpl.java b/sdk/digitaltwins/azure-resourcemanager-digitaltwins/src/main/java/com/azure/resourcemanager/digitaltwins/implementation/DigitalTwinsDescriptionImpl.java
index f2ea083b97c0..416116378ce4 100644
--- a/sdk/digitaltwins/azure-resourcemanager-digitaltwins/src/main/java/com/azure/resourcemanager/digitaltwins/implementation/DigitalTwinsDescriptionImpl.java
+++ b/sdk/digitaltwins/azure-resourcemanager-digitaltwins/src/main/java/com/azure/resourcemanager/digitaltwins/implementation/DigitalTwinsDescriptionImpl.java
@@ -6,7 +6,6 @@
 
 import com.azure.core.management.Region;
 import com.azure.core.util.Context;
-import com.azure.resourcemanager.digitaltwins.AzureDigitalTwinsManager;
 import com.azure.resourcemanager.digitaltwins.fluent.models.DigitalTwinsDescriptionInner;
 import com.azure.resourcemanager.digitaltwins.fluent.models.PrivateEndpointConnectionInner;
 import com.azure.resourcemanager.digitaltwins.models.DigitalTwinsDescription;
@@ -26,7 +25,7 @@ public final class DigitalTwinsDescriptionImpl
     implements DigitalTwinsDescription, DigitalTwinsDescription.Definition, DigitalTwinsDescription.Update {
     private DigitalTwinsDescriptionInner innerObject;
 
-    private final AzureDigitalTwinsManager serviceManager;
+    private final com.azure.resourcemanager.digitaltwins.AzureDigitalTwinsManager serviceManager;
 
     public String id() {
         return this.innerModel().id();
@@ -103,7 +102,7 @@ public DigitalTwinsDescriptionInner innerModel() {
         return this.innerObject;
     }
 
-    private AzureDigitalTwinsManager manager() {
+    private com.azure.resourcemanager.digitaltwins.AzureDigitalTwinsManager manager() {
         return this.serviceManager;
     }
 
@@ -136,7 +135,8 @@ public DigitalTwinsDescription create(Context context) {
         return this;
     }
 
-    DigitalTwinsDescriptionImpl(String name, AzureDigitalTwinsManager serviceManager) {
+    DigitalTwinsDescriptionImpl(
+        String name, com.azure.resourcemanager.digitaltwins.AzureDigitalTwinsManager serviceManager) {
         this.innerObject = new DigitalTwinsDescriptionInner();
         this.serviceManager = serviceManager;
         this.resourceName = name;
@@ -165,7 +165,9 @@ public DigitalTwinsDescription apply(Context context) {
         return this;
     }
 
-    DigitalTwinsDescriptionImpl(DigitalTwinsDescriptionInner innerObject, AzureDigitalTwinsManager serviceManager) {
+    DigitalTwinsDescriptionImpl(
+        DigitalTwinsDescriptionInner innerObject,
+        com.azure.resourcemanager.digitaltwins.AzureDigitalTwinsManager serviceManager) {
         this.innerObject = innerObject;
         this.serviceManager = serviceManager;
         this.resourceGroupName = Utils.getValueFromIdByName(innerObject.id(), "resourceGroups");
diff --git a/sdk/digitaltwins/azure-resourcemanager-digitaltwins/src/main/java/com/azure/resourcemanager/digitaltwins/implementation/DigitalTwinsEndpointResourceImpl.java b/sdk/digitaltwins/azure-resourcemanager-digitaltwins/src/main/java/com/azure/resourcemanager/digitaltwins/implementation/DigitalTwinsEndpointResourceImpl.java
index d48210617c3b..4bf42ad17a06 100644
--- a/sdk/digitaltwins/azure-resourcemanager-digitaltwins/src/main/java/com/azure/resourcemanager/digitaltwins/implementation/DigitalTwinsEndpointResourceImpl.java
+++ b/sdk/digitaltwins/azure-resourcemanager-digitaltwins/src/main/java/com/azure/resourcemanager/digitaltwins/implementation/DigitalTwinsEndpointResourceImpl.java
@@ -5,7 +5,6 @@
 package com.azure.resourcemanager.digitaltwins.implementation;
 
 import com.azure.core.util.Context;
-import com.azure.resourcemanager.digitaltwins.AzureDigitalTwinsManager;
 import com.azure.resourcemanager.digitaltwins.fluent.models.DigitalTwinsEndpointResourceInner;
 import com.azure.resourcemanager.digitaltwins.models.DigitalTwinsEndpointResource;
 import com.azure.resourcemanager.digitaltwins.models.DigitalTwinsEndpointResourceProperties;
@@ -16,7 +15,7 @@ public final class DigitalTwinsEndpointResourceImpl
         DigitalTwinsEndpointResource.Update {
     private DigitalTwinsEndpointResourceInner innerObject;
 
-    private final AzureDigitalTwinsManager serviceManager;
+    private final com.azure.resourcemanager.digitaltwins.AzureDigitalTwinsManager serviceManager;
 
     public String id() {
         return this.innerModel().id();
@@ -38,7 +37,7 @@ public DigitalTwinsEndpointResourceInner innerModel() {
         return this.innerObject;
     }
 
-    private AzureDigitalTwinsManager manager() {
+    private com.azure.resourcemanager.digitaltwins.AzureDigitalTwinsManager manager() {
         return this.serviceManager;
     }
 
@@ -73,7 +72,8 @@ public DigitalTwinsEndpointResource create(Context context) {
         return this;
     }
 
-    DigitalTwinsEndpointResourceImpl(String name, AzureDigitalTwinsManager serviceManager) {
+    DigitalTwinsEndpointResourceImpl(
+        String name, com.azure.resourcemanager.digitaltwins.AzureDigitalTwinsManager serviceManager) {
         this.innerObject = new DigitalTwinsEndpointResourceInner();
         this.serviceManager = serviceManager;
         this.endpointName = name;
@@ -102,7 +102,8 @@ public DigitalTwinsEndpointResource apply(Context context) {
     }
 
     DigitalTwinsEndpointResourceImpl(
-        DigitalTwinsEndpointResourceInner innerObject, AzureDigitalTwinsManager serviceManager) {
+        DigitalTwinsEndpointResourceInner innerObject,
+        com.azure.resourcemanager.digitaltwins.AzureDigitalTwinsManager serviceManager) {
         this.innerObject = innerObject;
         this.serviceManager = serviceManager;
         this.resourceGroupName = Utils.getValueFromIdByName(innerObject.id(), "resourceGroups");
diff --git a/sdk/digitaltwins/azure-resourcemanager-digitaltwins/src/main/java/com/azure/resourcemanager/digitaltwins/implementation/DigitalTwinsEndpointsClientImpl.java b/sdk/digitaltwins/azure-resourcemanager-digitaltwins/src/main/java/com/azure/resourcemanager/digitaltwins/implementation/DigitalTwinsEndpointsClientImpl.java
index 299947372e56..93c0d38dc5e0 100644
--- a/sdk/digitaltwins/azure-resourcemanager-digitaltwins/src/main/java/com/azure/resourcemanager/digitaltwins/implementation/DigitalTwinsEndpointsClientImpl.java
+++ b/sdk/digitaltwins/azure-resourcemanager-digitaltwins/src/main/java/com/azure/resourcemanager/digitaltwins/implementation/DigitalTwinsEndpointsClientImpl.java
@@ -197,7 +197,7 @@ private Mono<PagedResponse<DigitalTwinsEndpointResourceInner>> listSinglePageAsy
                         res.getValue().value(),
                         res.getValue().nextLink(),
                         null))
-            .subscriberContext(context -> context.putAll(FluxUtil.toReactorContext(this.client.getContext())));
+            .contextWrite(context -> context.putAll(FluxUtil.toReactorContext(this.client.getContext()).readOnly()));
     }
 
     /**
@@ -372,7 +372,7 @@ private Mono<Response<DigitalTwinsEndpointResourceInner>> getWithResponseAsync(
                             endpointName,
                             accept,
                             context))
-            .subscriberContext(context -> context.putAll(FluxUtil.toReactorContext(this.client.getContext())));
+            .contextWrite(context -> context.putAll(FluxUtil.toReactorContext(this.client.getContext()).readOnly()));
     }
 
     /**
@@ -546,7 +546,7 @@ private Mono<Response<Flux<ByteBuffer>>> createOrUpdateWithResponseAsync(
                             endpointDescription,
                             accept,
                             context))
-            .subscriberContext(context -> context.putAll(FluxUtil.toReactorContext(this.client.getContext())));
+            .contextWrite(context -> context.putAll(FluxUtil.toReactorContext(this.client.getContext()).readOnly()));
     }
 
     /**
@@ -868,7 +868,7 @@ private Mono<Response<Flux<ByteBuffer>>> deleteWithResponseAsync(
                             endpointName,
                             accept,
                             context))
-            .subscriberContext(context -> context.putAll(FluxUtil.toReactorContext(this.client.getContext())));
+            .contextWrite(context -> context.putAll(FluxUtil.toReactorContext(this.client.getContext()).readOnly()));
     }
 
     /**
@@ -1116,7 +1116,7 @@ private Mono<PagedResponse<DigitalTwinsEndpointResourceInner>> listNextSinglePag
                         res.getValue().value(),
                         res.getValue().nextLink(),
                         null))
-            .subscriberContext(context -> context.putAll(FluxUtil.toReactorContext(this.client.getContext())));
+            .contextWrite(context -> context.putAll(FluxUtil.toReactorContext(this.client.getContext()).readOnly()));
     }
 
     /**
diff --git a/sdk/digitaltwins/azure-resourcemanager-digitaltwins/src/main/java/com/azure/resourcemanager/digitaltwins/implementation/DigitalTwinsEndpointsImpl.java b/sdk/digitaltwins/azure-resourcemanager-digitaltwins/src/main/java/com/azure/resourcemanager/digitaltwins/implementation/DigitalTwinsEndpointsImpl.java
index b10c3413772d..bf997c9d25dc 100644
--- a/sdk/digitaltwins/azure-resourcemanager-digitaltwins/src/main/java/com/azure/resourcemanager/digitaltwins/implementation/DigitalTwinsEndpointsImpl.java
+++ b/sdk/digitaltwins/azure-resourcemanager-digitaltwins/src/main/java/com/azure/resourcemanager/digitaltwins/implementation/DigitalTwinsEndpointsImpl.java
@@ -9,7 +9,6 @@
 import com.azure.core.http.rest.SimpleResponse;
 import com.azure.core.util.Context;
 import com.azure.core.util.logging.ClientLogger;
-import com.azure.resourcemanager.digitaltwins.AzureDigitalTwinsManager;
 import com.azure.resourcemanager.digitaltwins.fluent.DigitalTwinsEndpointsClient;
 import com.azure.resourcemanager.digitaltwins.fluent.models.DigitalTwinsEndpointResourceInner;
 import com.azure.resourcemanager.digitaltwins.models.DigitalTwinsEndpointResource;
@@ -21,9 +20,11 @@ public final class DigitalTwinsEndpointsImpl implements DigitalTwinsEndpoints {
 
     private final DigitalTwinsEndpointsClient innerClient;
 
-    private final AzureDigitalTwinsManager serviceManager;
+    private final com.azure.resourcemanager.digitaltwins.AzureDigitalTwinsManager serviceManager;
 
-    public DigitalTwinsEndpointsImpl(DigitalTwinsEndpointsClient innerClient, AzureDigitalTwinsManager serviceManager) {
+    public DigitalTwinsEndpointsImpl(
+        DigitalTwinsEndpointsClient innerClient,
+        com.azure.resourcemanager.digitaltwins.AzureDigitalTwinsManager serviceManager) {
         this.innerClient = innerClient;
         this.serviceManager = serviceManager;
     }
@@ -207,7 +208,7 @@ private DigitalTwinsEndpointsClient serviceClient() {
         return this.innerClient;
     }
 
-    private AzureDigitalTwinsManager manager() {
+    private com.azure.resourcemanager.digitaltwins.AzureDigitalTwinsManager manager() {
         return this.serviceManager;
     }
 
diff --git a/sdk/digitaltwins/azure-resourcemanager-digitaltwins/src/main/java/com/azure/resourcemanager/digitaltwins/implementation/DigitalTwinsImpl.java b/sdk/digitaltwins/azure-resourcemanager-digitaltwins/src/main/java/com/azure/resourcemanager/digitaltwins/implementation/DigitalTwinsImpl.java
index 33e3ebc04012..46156d72416e 100644
--- a/sdk/digitaltwins/azure-resourcemanager-digitaltwins/src/main/java/com/azure/resourcemanager/digitaltwins/implementation/DigitalTwinsImpl.java
+++ b/sdk/digitaltwins/azure-resourcemanager-digitaltwins/src/main/java/com/azure/resourcemanager/digitaltwins/implementation/DigitalTwinsImpl.java
@@ -9,7 +9,6 @@
 import com.azure.core.http.rest.SimpleResponse;
 import com.azure.core.util.Context;
 import com.azure.core.util.logging.ClientLogger;
-import com.azure.resourcemanager.digitaltwins.AzureDigitalTwinsManager;
 import com.azure.resourcemanager.digitaltwins.fluent.DigitalTwinsClient;
 import com.azure.resourcemanager.digitaltwins.fluent.models.CheckNameResultInner;
 import com.azure.resourcemanager.digitaltwins.fluent.models.DigitalTwinsDescriptionInner;
@@ -24,9 +23,11 @@ public final class DigitalTwinsImpl implements DigitalTwins {
 
     private final DigitalTwinsClient innerClient;
 
-    private final AzureDigitalTwinsManager serviceManager;
+    private final com.azure.resourcemanager.digitaltwins.AzureDigitalTwinsManager serviceManager;
 
-    public DigitalTwinsImpl(DigitalTwinsClient innerClient, AzureDigitalTwinsManager serviceManager) {
+    public DigitalTwinsImpl(
+        DigitalTwinsClient innerClient,
+        com.azure.resourcemanager.digitaltwins.AzureDigitalTwinsManager serviceManager) {
         this.innerClient = innerClient;
         this.serviceManager = serviceManager;
     }
@@ -211,7 +212,7 @@ private DigitalTwinsClient serviceClient() {
         return this.innerClient;
     }
 
-    private AzureDigitalTwinsManager manager() {
+    private com.azure.resourcemanager.digitaltwins.AzureDigitalTwinsManager manager() {
         return this.serviceManager;
     }
 
diff --git a/sdk/digitaltwins/azure-resourcemanager-digitaltwins/src/main/java/com/azure/resourcemanager/digitaltwins/implementation/GroupIdInformationImpl.java b/sdk/digitaltwins/azure-resourcemanager-digitaltwins/src/main/java/com/azure/resourcemanager/digitaltwins/implementation/GroupIdInformationImpl.java
index 0078089e381f..08bbff8ff003 100644
--- a/sdk/digitaltwins/azure-resourcemanager-digitaltwins/src/main/java/com/azure/resourcemanager/digitaltwins/implementation/GroupIdInformationImpl.java
+++ b/sdk/digitaltwins/azure-resourcemanager-digitaltwins/src/main/java/com/azure/resourcemanager/digitaltwins/implementation/GroupIdInformationImpl.java
@@ -4,7 +4,6 @@
 
 package com.azure.resourcemanager.digitaltwins.implementation;
 
-import com.azure.resourcemanager.digitaltwins.AzureDigitalTwinsManager;
 import com.azure.resourcemanager.digitaltwins.fluent.models.GroupIdInformationInner;
 import com.azure.resourcemanager.digitaltwins.models.GroupIdInformation;
 import com.azure.resourcemanager.digitaltwins.models.GroupIdInformationProperties;
@@ -12,9 +11,11 @@
 public final class GroupIdInformationImpl implements GroupIdInformation {
     private GroupIdInformationInner innerObject;
 
-    private final AzureDigitalTwinsManager serviceManager;
+    private final com.azure.resourcemanager.digitaltwins.AzureDigitalTwinsManager serviceManager;
 
-    GroupIdInformationImpl(GroupIdInformationInner innerObject, AzureDigitalTwinsManager serviceManager) {
+    GroupIdInformationImpl(
+        GroupIdInformationInner innerObject,
+        com.azure.resourcemanager.digitaltwins.AzureDigitalTwinsManager serviceManager) {
         this.innerObject = innerObject;
         this.serviceManager = serviceManager;
     }
@@ -39,7 +40,7 @@ public GroupIdInformationInner innerModel() {
         return this.innerObject;
     }
 
-    private AzureDigitalTwinsManager manager() {
+    private com.azure.resourcemanager.digitaltwins.AzureDigitalTwinsManager manager() {
         return this.serviceManager;
     }
 }
diff --git a/sdk/digitaltwins/azure-resourcemanager-digitaltwins/src/main/java/com/azure/resourcemanager/digitaltwins/implementation/GroupIdInformationResponseImpl.java b/sdk/digitaltwins/azure-resourcemanager-digitaltwins/src/main/java/com/azure/resourcemanager/digitaltwins/implementation/GroupIdInformationResponseImpl.java
index f43ef6f61d5d..f262fca7d0d4 100644
--- a/sdk/digitaltwins/azure-resourcemanager-digitaltwins/src/main/java/com/azure/resourcemanager/digitaltwins/implementation/GroupIdInformationResponseImpl.java
+++ b/sdk/digitaltwins/azure-resourcemanager-digitaltwins/src/main/java/com/azure/resourcemanager/digitaltwins/implementation/GroupIdInformationResponseImpl.java
@@ -4,7 +4,6 @@
 
 package com.azure.resourcemanager.digitaltwins.implementation;
 
-import com.azure.resourcemanager.digitaltwins.AzureDigitalTwinsManager;
 import com.azure.resourcemanager.digitaltwins.fluent.models.GroupIdInformationInner;
 import com.azure.resourcemanager.digitaltwins.fluent.models.GroupIdInformationResponseInner;
 import com.azure.resourcemanager.digitaltwins.models.GroupIdInformation;
@@ -16,10 +15,11 @@
 public final class GroupIdInformationResponseImpl implements GroupIdInformationResponse {
     private GroupIdInformationResponseInner innerObject;
 
-    private final AzureDigitalTwinsManager serviceManager;
+    private final com.azure.resourcemanager.digitaltwins.AzureDigitalTwinsManager serviceManager;
 
     GroupIdInformationResponseImpl(
-        GroupIdInformationResponseInner innerObject, AzureDigitalTwinsManager serviceManager) {
+        GroupIdInformationResponseInner innerObject,
+        com.azure.resourcemanager.digitaltwins.AzureDigitalTwinsManager serviceManager) {
         this.innerObject = innerObject;
         this.serviceManager = serviceManager;
     }
@@ -42,7 +42,7 @@ public GroupIdInformationResponseInner innerModel() {
         return this.innerObject;
     }
 
-    private AzureDigitalTwinsManager manager() {
+    private com.azure.resourcemanager.digitaltwins.AzureDigitalTwinsManager manager() {
         return this.serviceManager;
     }
 }
diff --git a/sdk/digitaltwins/azure-resourcemanager-digitaltwins/src/main/java/com/azure/resourcemanager/digitaltwins/implementation/OperationImpl.java b/sdk/digitaltwins/azure-resourcemanager-digitaltwins/src/main/java/com/azure/resourcemanager/digitaltwins/implementation/OperationImpl.java
index b193db513382..821e7e992196 100644
--- a/sdk/digitaltwins/azure-resourcemanager-digitaltwins/src/main/java/com/azure/resourcemanager/digitaltwins/implementation/OperationImpl.java
+++ b/sdk/digitaltwins/azure-resourcemanager-digitaltwins/src/main/java/com/azure/resourcemanager/digitaltwins/implementation/OperationImpl.java
@@ -4,7 +4,6 @@
 
 package com.azure.resourcemanager.digitaltwins.implementation;
 
-import com.azure.resourcemanager.digitaltwins.AzureDigitalTwinsManager;
 import com.azure.resourcemanager.digitaltwins.fluent.models.OperationInner;
 import com.azure.resourcemanager.digitaltwins.models.Operation;
 import com.azure.resourcemanager.digitaltwins.models.OperationDisplay;
@@ -12,9 +11,10 @@
 public final class OperationImpl implements Operation {
     private OperationInner innerObject;
 
-    private final AzureDigitalTwinsManager serviceManager;
+    private final com.azure.resourcemanager.digitaltwins.AzureDigitalTwinsManager serviceManager;
 
-    OperationImpl(OperationInner innerObject, AzureDigitalTwinsManager serviceManager) {
+    OperationImpl(
+        OperationInner innerObject, com.azure.resourcemanager.digitaltwins.AzureDigitalTwinsManager serviceManager) {
         this.innerObject = innerObject;
         this.serviceManager = serviceManager;
     }
@@ -39,7 +39,7 @@ public OperationInner innerModel() {
         return this.innerObject;
     }
 
-    private AzureDigitalTwinsManager manager() {
+    private com.azure.resourcemanager.digitaltwins.AzureDigitalTwinsManager manager() {
         return this.serviceManager;
     }
 }
diff --git a/sdk/digitaltwins/azure-resourcemanager-digitaltwins/src/main/java/com/azure/resourcemanager/digitaltwins/implementation/OperationsClientImpl.java b/sdk/digitaltwins/azure-resourcemanager-digitaltwins/src/main/java/com/azure/resourcemanager/digitaltwins/implementation/OperationsClientImpl.java
index f9c1dbe8fb44..b7f8e7507ebe 100644
--- a/sdk/digitaltwins/azure-resourcemanager-digitaltwins/src/main/java/com/azure/resourcemanager/digitaltwins/implementation/OperationsClientImpl.java
+++ b/sdk/digitaltwins/azure-resourcemanager-digitaltwins/src/main/java/com/azure/resourcemanager/digitaltwins/implementation/OperationsClientImpl.java
@@ -108,7 +108,7 @@ private Mono<PagedResponse<OperationInner>> listSinglePageAsync() {
                         res.getValue().value(),
                         res.getValue().nextLink(),
                         null))
-            .subscriberContext(context -> context.putAll(FluxUtil.toReactorContext(this.client.getContext())));
+            .contextWrite(context -> context.putAll(FluxUtil.toReactorContext(this.client.getContext()).readOnly()));
     }
 
     /**
@@ -228,7 +228,7 @@ private Mono<PagedResponse<OperationInner>> listNextSinglePageAsync(String nextL
                         res.getValue().value(),
                         res.getValue().nextLink(),
                         null))
-            .subscriberContext(context -> context.putAll(FluxUtil.toReactorContext(this.client.getContext())));
+            .contextWrite(context -> context.putAll(FluxUtil.toReactorContext(this.client.getContext()).readOnly()));
     }
 
     /**
diff --git a/sdk/digitaltwins/azure-resourcemanager-digitaltwins/src/main/java/com/azure/resourcemanager/digitaltwins/implementation/OperationsImpl.java b/sdk/digitaltwins/azure-resourcemanager-digitaltwins/src/main/java/com/azure/resourcemanager/digitaltwins/implementation/OperationsImpl.java
index 9b0c2f4c671f..24212674fce5 100644
--- a/sdk/digitaltwins/azure-resourcemanager-digitaltwins/src/main/java/com/azure/resourcemanager/digitaltwins/implementation/OperationsImpl.java
+++ b/sdk/digitaltwins/azure-resourcemanager-digitaltwins/src/main/java/com/azure/resourcemanager/digitaltwins/implementation/OperationsImpl.java
@@ -7,7 +7,6 @@
 import com.azure.core.http.rest.PagedIterable;
 import com.azure.core.util.Context;
 import com.azure.core.util.logging.ClientLogger;
-import com.azure.resourcemanager.digitaltwins.AzureDigitalTwinsManager;
 import com.azure.resourcemanager.digitaltwins.fluent.OperationsClient;
 import com.azure.resourcemanager.digitaltwins.fluent.models.OperationInner;
 import com.azure.resourcemanager.digitaltwins.models.Operation;
@@ -19,9 +18,10 @@ public final class OperationsImpl implements Operations {
 
     private final OperationsClient innerClient;
 
-    private final AzureDigitalTwinsManager serviceManager;
+    private final com.azure.resourcemanager.digitaltwins.AzureDigitalTwinsManager serviceManager;
 
-    public OperationsImpl(OperationsClient innerClient, AzureDigitalTwinsManager serviceManager) {
+    public OperationsImpl(
+        OperationsClient innerClient, com.azure.resourcemanager.digitaltwins.AzureDigitalTwinsManager serviceManager) {
         this.innerClient = innerClient;
         this.serviceManager = serviceManager;
     }
@@ -40,7 +40,7 @@ private OperationsClient serviceClient() {
         return this.innerClient;
     }
 
-    private AzureDigitalTwinsManager manager() {
+    private com.azure.resourcemanager.digitaltwins.AzureDigitalTwinsManager manager() {
         return this.serviceManager;
     }
 }
diff --git a/sdk/digitaltwins/azure-resourcemanager-digitaltwins/src/main/java/com/azure/resourcemanager/digitaltwins/implementation/PrivateEndpointConnectionImpl.java b/sdk/digitaltwins/azure-resourcemanager-digitaltwins/src/main/java/com/azure/resourcemanager/digitaltwins/implementation/PrivateEndpointConnectionImpl.java
index 513fb62cdd44..e36da15f84e6 100644
--- a/sdk/digitaltwins/azure-resourcemanager-digitaltwins/src/main/java/com/azure/resourcemanager/digitaltwins/implementation/PrivateEndpointConnectionImpl.java
+++ b/sdk/digitaltwins/azure-resourcemanager-digitaltwins/src/main/java/com/azure/resourcemanager/digitaltwins/implementation/PrivateEndpointConnectionImpl.java
@@ -5,16 +5,15 @@
 package com.azure.resourcemanager.digitaltwins.implementation;
 
 import com.azure.core.util.Context;
-import com.azure.resourcemanager.digitaltwins.AzureDigitalTwinsManager;
 import com.azure.resourcemanager.digitaltwins.fluent.models.PrivateEndpointConnectionInner;
-import com.azure.resourcemanager.digitaltwins.models.ConnectionProperties;
 import com.azure.resourcemanager.digitaltwins.models.PrivateEndpointConnection;
+import com.azure.resourcemanager.digitaltwins.models.PrivateEndpointConnectionProperties;
 
 public final class PrivateEndpointConnectionImpl
     implements PrivateEndpointConnection, PrivateEndpointConnection.Definition, PrivateEndpointConnection.Update {
     private PrivateEndpointConnectionInner innerObject;
 
-    private final AzureDigitalTwinsManager serviceManager;
+    private final com.azure.resourcemanager.digitaltwins.AzureDigitalTwinsManager serviceManager;
 
     public String id() {
         return this.innerModel().id();
@@ -28,7 +27,7 @@ public String type() {
         return this.innerModel().type();
     }
 
-    public ConnectionProperties properties() {
+    public PrivateEndpointConnectionProperties properties() {
         return this.innerModel().properties();
     }
 
@@ -36,7 +35,7 @@ public PrivateEndpointConnectionInner innerModel() {
         return this.innerObject;
     }
 
-    private AzureDigitalTwinsManager manager() {
+    private com.azure.resourcemanager.digitaltwins.AzureDigitalTwinsManager manager() {
         return this.serviceManager;
     }
 
@@ -73,7 +72,8 @@ public PrivateEndpointConnection create(Context context) {
         return this;
     }
 
-    PrivateEndpointConnectionImpl(String name, AzureDigitalTwinsManager serviceManager) {
+    PrivateEndpointConnectionImpl(
+        String name, com.azure.resourcemanager.digitaltwins.AzureDigitalTwinsManager serviceManager) {
         this.innerObject = new PrivateEndpointConnectionInner();
         this.serviceManager = serviceManager;
         this.privateEndpointConnectionName = name;
@@ -103,7 +103,9 @@ public PrivateEndpointConnection apply(Context context) {
         return this;
     }
 
-    PrivateEndpointConnectionImpl(PrivateEndpointConnectionInner innerObject, AzureDigitalTwinsManager serviceManager) {
+    PrivateEndpointConnectionImpl(
+        PrivateEndpointConnectionInner innerObject,
+        com.azure.resourcemanager.digitaltwins.AzureDigitalTwinsManager serviceManager) {
         this.innerObject = innerObject;
         this.serviceManager = serviceManager;
         this.resourceGroupName = Utils.getValueFromIdByName(innerObject.id(), "resourceGroups");
@@ -131,7 +133,7 @@ public PrivateEndpointConnection refresh(Context context) {
         return this;
     }
 
-    public PrivateEndpointConnectionImpl withProperties(ConnectionProperties properties) {
+    public PrivateEndpointConnectionImpl withProperties(PrivateEndpointConnectionProperties properties) {
         this.innerModel().withProperties(properties);
         return this;
     }
diff --git a/sdk/digitaltwins/azure-resourcemanager-digitaltwins/src/main/java/com/azure/resourcemanager/digitaltwins/implementation/PrivateEndpointConnectionsClientImpl.java b/sdk/digitaltwins/azure-resourcemanager-digitaltwins/src/main/java/com/azure/resourcemanager/digitaltwins/implementation/PrivateEndpointConnectionsClientImpl.java
index 84c7e607c16f..9ee0aeb17ca3 100644
--- a/sdk/digitaltwins/azure-resourcemanager-digitaltwins/src/main/java/com/azure/resourcemanager/digitaltwins/implementation/PrivateEndpointConnectionsClientImpl.java
+++ b/sdk/digitaltwins/azure-resourcemanager-digitaltwins/src/main/java/com/azure/resourcemanager/digitaltwins/implementation/PrivateEndpointConnectionsClientImpl.java
@@ -175,7 +175,7 @@ private Mono<Response<PrivateEndpointConnectionsResponseInner>> listWithResponse
                             resourceName,
                             accept,
                             context))
-            .subscriberContext(context -> context.putAll(FluxUtil.toReactorContext(this.client.getContext())));
+            .contextWrite(context -> context.putAll(FluxUtil.toReactorContext(this.client.getContext()).readOnly()));
     }
 
     /**
@@ -332,7 +332,7 @@ private Mono<Response<PrivateEndpointConnectionInner>> getWithResponseAsync(
                             privateEndpointConnectionName,
                             accept,
                             context))
-            .subscriberContext(context -> context.putAll(FluxUtil.toReactorContext(this.client.getContext())));
+            .contextWrite(context -> context.putAll(FluxUtil.toReactorContext(this.client.getContext()).readOnly()));
     }
 
     /**
@@ -502,7 +502,7 @@ private Mono<Response<Flux<ByteBuffer>>> deleteWithResponseAsync(
                             privateEndpointConnectionName,
                             accept,
                             context))
-            .subscriberContext(context -> context.putAll(FluxUtil.toReactorContext(this.client.getContext())));
+            .contextWrite(context -> context.putAll(FluxUtil.toReactorContext(this.client.getContext()).readOnly()));
     }
 
     /**
@@ -776,7 +776,7 @@ private Mono<Response<Flux<ByteBuffer>>> createOrUpdateWithResponseAsync(
                             privateEndpointConnection,
                             accept,
                             context))
-            .subscriberContext(context -> context.putAll(FluxUtil.toReactorContext(this.client.getContext())));
+            .contextWrite(context -> context.putAll(FluxUtil.toReactorContext(this.client.getContext()).readOnly()));
     }
 
     /**
diff --git a/sdk/digitaltwins/azure-resourcemanager-digitaltwins/src/main/java/com/azure/resourcemanager/digitaltwins/implementation/PrivateEndpointConnectionsImpl.java b/sdk/digitaltwins/azure-resourcemanager-digitaltwins/src/main/java/com/azure/resourcemanager/digitaltwins/implementation/PrivateEndpointConnectionsImpl.java
index 1b1c604262da..f51514e912b4 100644
--- a/sdk/digitaltwins/azure-resourcemanager-digitaltwins/src/main/java/com/azure/resourcemanager/digitaltwins/implementation/PrivateEndpointConnectionsImpl.java
+++ b/sdk/digitaltwins/azure-resourcemanager-digitaltwins/src/main/java/com/azure/resourcemanager/digitaltwins/implementation/PrivateEndpointConnectionsImpl.java
@@ -8,7 +8,6 @@
 import com.azure.core.http.rest.SimpleResponse;
 import com.azure.core.util.Context;
 import com.azure.core.util.logging.ClientLogger;
-import com.azure.resourcemanager.digitaltwins.AzureDigitalTwinsManager;
 import com.azure.resourcemanager.digitaltwins.fluent.PrivateEndpointConnectionsClient;
 import com.azure.resourcemanager.digitaltwins.fluent.models.PrivateEndpointConnectionInner;
 import com.azure.resourcemanager.digitaltwins.fluent.models.PrivateEndpointConnectionsResponseInner;
@@ -22,10 +21,11 @@ public final class PrivateEndpointConnectionsImpl implements PrivateEndpointConn
 
     private final PrivateEndpointConnectionsClient innerClient;
 
-    private final AzureDigitalTwinsManager serviceManager;
+    private final com.azure.resourcemanager.digitaltwins.AzureDigitalTwinsManager serviceManager;
 
     public PrivateEndpointConnectionsImpl(
-        PrivateEndpointConnectionsClient innerClient, AzureDigitalTwinsManager serviceManager) {
+        PrivateEndpointConnectionsClient innerClient,
+        com.azure.resourcemanager.digitaltwins.AzureDigitalTwinsManager serviceManager) {
         this.innerClient = innerClient;
         this.serviceManager = serviceManager;
     }
@@ -225,7 +225,7 @@ private PrivateEndpointConnectionsClient serviceClient() {
         return this.innerClient;
     }
 
-    private AzureDigitalTwinsManager manager() {
+    private com.azure.resourcemanager.digitaltwins.AzureDigitalTwinsManager manager() {
         return this.serviceManager;
     }
 
diff --git a/sdk/digitaltwins/azure-resourcemanager-digitaltwins/src/main/java/com/azure/resourcemanager/digitaltwins/implementation/PrivateEndpointConnectionsResponseImpl.java b/sdk/digitaltwins/azure-resourcemanager-digitaltwins/src/main/java/com/azure/resourcemanager/digitaltwins/implementation/PrivateEndpointConnectionsResponseImpl.java
index 5652bbf880d5..da0d86788c26 100644
--- a/sdk/digitaltwins/azure-resourcemanager-digitaltwins/src/main/java/com/azure/resourcemanager/digitaltwins/implementation/PrivateEndpointConnectionsResponseImpl.java
+++ b/sdk/digitaltwins/azure-resourcemanager-digitaltwins/src/main/java/com/azure/resourcemanager/digitaltwins/implementation/PrivateEndpointConnectionsResponseImpl.java
@@ -4,7 +4,6 @@
 
 package com.azure.resourcemanager.digitaltwins.implementation;
 
-import com.azure.resourcemanager.digitaltwins.AzureDigitalTwinsManager;
 import com.azure.resourcemanager.digitaltwins.fluent.models.PrivateEndpointConnectionInner;
 import com.azure.resourcemanager.digitaltwins.fluent.models.PrivateEndpointConnectionsResponseInner;
 import com.azure.resourcemanager.digitaltwins.models.PrivateEndpointConnection;
@@ -16,10 +15,11 @@
 public final class PrivateEndpointConnectionsResponseImpl implements PrivateEndpointConnectionsResponse {
     private PrivateEndpointConnectionsResponseInner innerObject;
 
-    private final AzureDigitalTwinsManager serviceManager;
+    private final com.azure.resourcemanager.digitaltwins.AzureDigitalTwinsManager serviceManager;
 
     PrivateEndpointConnectionsResponseImpl(
-        PrivateEndpointConnectionsResponseInner innerObject, AzureDigitalTwinsManager serviceManager) {
+        PrivateEndpointConnectionsResponseInner innerObject,
+        com.azure.resourcemanager.digitaltwins.AzureDigitalTwinsManager serviceManager) {
         this.innerObject = innerObject;
         this.serviceManager = serviceManager;
     }
@@ -42,7 +42,7 @@ public PrivateEndpointConnectionsResponseInner innerModel() {
         return this.innerObject;
     }
 
-    private AzureDigitalTwinsManager manager() {
+    private com.azure.resourcemanager.digitaltwins.AzureDigitalTwinsManager manager() {
         return this.serviceManager;
     }
 }
diff --git a/sdk/digitaltwins/azure-resourcemanager-digitaltwins/src/main/java/com/azure/resourcemanager/digitaltwins/implementation/PrivateLinkResourcesClientImpl.java b/sdk/digitaltwins/azure-resourcemanager-digitaltwins/src/main/java/com/azure/resourcemanager/digitaltwins/implementation/PrivateLinkResourcesClientImpl.java
index 25dcb163a2f5..c334446aa255 100644
--- a/sdk/digitaltwins/azure-resourcemanager-digitaltwins/src/main/java/com/azure/resourcemanager/digitaltwins/implementation/PrivateLinkResourcesClientImpl.java
+++ b/sdk/digitaltwins/azure-resourcemanager-digitaltwins/src/main/java/com/azure/resourcemanager/digitaltwins/implementation/PrivateLinkResourcesClientImpl.java
@@ -133,7 +133,7 @@ private Mono<Response<GroupIdInformationResponseInner>> listWithResponseAsync(
                             resourceName,
                             accept,
                             context))
-            .subscriberContext(context -> context.putAll(FluxUtil.toReactorContext(this.client.getContext())));
+            .contextWrite(context -> context.putAll(FluxUtil.toReactorContext(this.client.getContext()).readOnly()));
     }
 
     /**
@@ -287,7 +287,7 @@ private Mono<Response<GroupIdInformationInner>> getWithResponseAsync(
                             resourceId,
                             accept,
                             context))
-            .subscriberContext(context -> context.putAll(FluxUtil.toReactorContext(this.client.getContext())));
+            .contextWrite(context -> context.putAll(FluxUtil.toReactorContext(this.client.getContext()).readOnly()));
     }
 
     /**
diff --git a/sdk/digitaltwins/azure-resourcemanager-digitaltwins/src/main/java/com/azure/resourcemanager/digitaltwins/implementation/PrivateLinkResourcesImpl.java b/sdk/digitaltwins/azure-resourcemanager-digitaltwins/src/main/java/com/azure/resourcemanager/digitaltwins/implementation/PrivateLinkResourcesImpl.java
index f5823d045743..89605bd86496 100644
--- a/sdk/digitaltwins/azure-resourcemanager-digitaltwins/src/main/java/com/azure/resourcemanager/digitaltwins/implementation/PrivateLinkResourcesImpl.java
+++ b/sdk/digitaltwins/azure-resourcemanager-digitaltwins/src/main/java/com/azure/resourcemanager/digitaltwins/implementation/PrivateLinkResourcesImpl.java
@@ -8,7 +8,6 @@
 import com.azure.core.http.rest.SimpleResponse;
 import com.azure.core.util.Context;
 import com.azure.core.util.logging.ClientLogger;
-import com.azure.resourcemanager.digitaltwins.AzureDigitalTwinsManager;
 import com.azure.resourcemanager.digitaltwins.fluent.PrivateLinkResourcesClient;
 import com.azure.resourcemanager.digitaltwins.fluent.models.GroupIdInformationInner;
 import com.azure.resourcemanager.digitaltwins.fluent.models.GroupIdInformationResponseInner;
@@ -22,9 +21,11 @@ public final class PrivateLinkResourcesImpl implements PrivateLinkResources {
 
     private final PrivateLinkResourcesClient innerClient;
 
-    private final AzureDigitalTwinsManager serviceManager;
+    private final com.azure.resourcemanager.digitaltwins.AzureDigitalTwinsManager serviceManager;
 
-    public PrivateLinkResourcesImpl(PrivateLinkResourcesClient innerClient, AzureDigitalTwinsManager serviceManager) {
+    public PrivateLinkResourcesImpl(
+        PrivateLinkResourcesClient innerClient,
+        com.azure.resourcemanager.digitaltwins.AzureDigitalTwinsManager serviceManager) {
         this.innerClient = innerClient;
         this.serviceManager = serviceManager;
     }
@@ -81,7 +82,7 @@ private PrivateLinkResourcesClient serviceClient() {
         return this.innerClient;
     }
 
-    private AzureDigitalTwinsManager manager() {
+    private com.azure.resourcemanager.digitaltwins.AzureDigitalTwinsManager manager() {
         return this.serviceManager;
     }
 }
diff --git a/sdk/digitaltwins/azure-resourcemanager-digitaltwins/src/main/java/com/azure/resourcemanager/digitaltwins/implementation/Utils.java b/sdk/digitaltwins/azure-resourcemanager-digitaltwins/src/main/java/com/azure/resourcemanager/digitaltwins/implementation/Utils.java
index 4cc0600d8d38..c4d4bc812a6a 100644
--- a/sdk/digitaltwins/azure-resourcemanager-digitaltwins/src/main/java/com/azure/resourcemanager/digitaltwins/implementation/Utils.java
+++ b/sdk/digitaltwins/azure-resourcemanager-digitaltwins/src/main/java/com/azure/resourcemanager/digitaltwins/implementation/Utils.java
@@ -9,8 +9,6 @@
 import com.azure.core.http.rest.PagedResponse;
 import com.azure.core.http.rest.PagedResponseBase;
 import com.azure.core.util.CoreUtils;
-import reactor.core.publisher.Mono;
-
 import java.util.ArrayList;
 import java.util.Arrays;
 import java.util.Collections;
@@ -19,6 +17,7 @@
 import java.util.function.Function;
 import java.util.stream.Collectors;
 import java.util.stream.Stream;
+import reactor.core.publisher.Flux;
 
 final class Utils {
     static String getValueFromIdByName(String id, String name) {
@@ -80,76 +79,84 @@ static <T, S> PagedIterable<S> mapPage(PagedIterable<T> pageIterable, Function<T
 
     private static final class PagedIterableImpl<T, S> extends PagedIterable<S> {
 
-        private final PagedIterable<T> pageIterable;
+        private final PagedIterable<T> pagedIterable;
         private final Function<T, S> mapper;
         private final Function<PagedResponse<T>, PagedResponse<S>> pageMapper;
 
-        private PagedIterableImpl(PagedIterable<T> pageIterable, Function<T, S> mapper) {
-            super(new PagedFlux<S>(() -> Mono.empty()));
-            this.pageIterable = pageIterable;
+        private PagedIterableImpl(PagedIterable<T> pagedIterable, Function<T, S> mapper) {
+            super(
+                PagedFlux
+                    .create(
+                        () ->
+                            (continuationToken, pageSize) ->
+                                Flux.fromStream(pagedIterable.streamByPage().map(getPageMapper(mapper)))));
+            this.pagedIterable = pagedIterable;
             this.mapper = mapper;
-            this.pageMapper =
-                page ->
-                    new PagedResponseBase<Void, S>(
-                        page.getRequest(),
-                        page.getStatusCode(),
-                        page.getHeaders(),
-                        page.getElements().stream().map(mapper).collect(Collectors.toList()),
-                        page.getContinuationToken(),
-                        null);
+            this.pageMapper = getPageMapper(mapper);
+        }
+
+        private static <T, S> Function<PagedResponse<T>, PagedResponse<S>> getPageMapper(Function<T, S> mapper) {
+            return page ->
+                new PagedResponseBase<Void, S>(
+                    page.getRequest(),
+                    page.getStatusCode(),
+                    page.getHeaders(),
+                    page.getElements().stream().map(mapper).collect(Collectors.toList()),
+                    page.getContinuationToken(),
+                    null);
         }
 
         @Override
         public Stream<S> stream() {
-            return pageIterable.stream().map(mapper);
+            return pagedIterable.stream().map(mapper);
         }
 
         @Override
         public Stream<PagedResponse<S>> streamByPage() {
-            return pageIterable.streamByPage().map(pageMapper);
+            return pagedIterable.streamByPage().map(pageMapper);
         }
 
         @Override
         public Stream<PagedResponse<S>> streamByPage(String continuationToken) {
-            return pageIterable.streamByPage(continuationToken).map(pageMapper);
+            return pagedIterable.streamByPage(continuationToken).map(pageMapper);
         }
 
         @Override
         public Stream<PagedResponse<S>> streamByPage(int preferredPageSize) {
-            return pageIterable.streamByPage(preferredPageSize).map(pageMapper);
+            return pagedIterable.streamByPage(preferredPageSize).map(pageMapper);
         }
 
         @Override
         public Stream<PagedResponse<S>> streamByPage(String continuationToken, int preferredPageSize) {
-            return pageIterable.streamByPage(continuationToken, preferredPageSize).map(pageMapper);
+            return pagedIterable.streamByPage(continuationToken, preferredPageSize).map(pageMapper);
         }
 
         @Override
         public Iterator<S> iterator() {
-            return new IteratorImpl<T, S>(pageIterable.iterator(), mapper);
+            return new IteratorImpl<T, S>(pagedIterable.iterator(), mapper);
         }
 
         @Override
         public Iterable<PagedResponse<S>> iterableByPage() {
-            return new IterableImpl<PagedResponse<T>, PagedResponse<S>>(pageIterable.iterableByPage(), pageMapper);
+            return new IterableImpl<PagedResponse<T>, PagedResponse<S>>(pagedIterable.iterableByPage(), pageMapper);
         }
 
         @Override
         public Iterable<PagedResponse<S>> iterableByPage(String continuationToken) {
             return new IterableImpl<PagedResponse<T>, PagedResponse<S>>(
-                pageIterable.iterableByPage(continuationToken), pageMapper);
+                pagedIterable.iterableByPage(continuationToken), pageMapper);
         }
 
         @Override
         public Iterable<PagedResponse<S>> iterableByPage(int preferredPageSize) {
             return new IterableImpl<PagedResponse<T>, PagedResponse<S>>(
-                pageIterable.iterableByPage(preferredPageSize), pageMapper);
+                pagedIterable.iterableByPage(preferredPageSize), pageMapper);
         }
 
         @Override
         public Iterable<PagedResponse<S>> iterableByPage(String continuationToken, int preferredPageSize) {
             return new IterableImpl<PagedResponse<T>, PagedResponse<S>>(
-                pageIterable.iterableByPage(continuationToken, preferredPageSize), pageMapper);
+                pagedIterable.iterableByPage(continuationToken, preferredPageSize), pageMapper);
         }
     }
 
diff --git a/sdk/digitaltwins/azure-resourcemanager-digitaltwins/src/main/java/com/azure/resourcemanager/digitaltwins/models/ConnectionProperties.java b/sdk/digitaltwins/azure-resourcemanager-digitaltwins/src/main/java/com/azure/resourcemanager/digitaltwins/models/ConnectionProperties.java
index 63fc1cc5fc5e..7571e4ca8116 100644
--- a/sdk/digitaltwins/azure-resourcemanager-digitaltwins/src/main/java/com/azure/resourcemanager/digitaltwins/models/ConnectionProperties.java
+++ b/sdk/digitaltwins/azure-resourcemanager-digitaltwins/src/main/java/com/azure/resourcemanager/digitaltwins/models/ConnectionProperties.java
@@ -22,10 +22,10 @@ public class ConnectionProperties {
     private ConnectionPropertiesProvisioningState provisioningState;
 
     /*
-     * The private endpoint property of a private endpoint connection.
+     * The privateEndpoint property.
      */
     @JsonProperty(value = "privateEndpoint")
-    private PrivateEndpoint privateEndpoint;
+    private ConnectionPropertiesPrivateEndpoint privateEndpoint;
 
     /*
      * The list of group ids for the private endpoint connection.
@@ -34,10 +34,10 @@ public class ConnectionProperties {
     private List<String> groupIds;
 
     /*
-     * The current state of a private endpoint connection.
+     * The privateLinkServiceConnectionState property.
      */
     @JsonProperty(value = "privateLinkServiceConnectionState")
-    private ConnectionState privateLinkServiceConnectionState;
+    private ConnectionPropertiesPrivateLinkServiceConnectionState privateLinkServiceConnectionState;
 
     /**
      * Get the provisioningState property: The provisioning state.
@@ -49,21 +49,21 @@ public ConnectionPropertiesProvisioningState provisioningState() {
     }
 
     /**
-     * Get the privateEndpoint property: The private endpoint property of a private endpoint connection.
+     * Get the privateEndpoint property: The privateEndpoint property.
      *
      * @return the privateEndpoint value.
      */
-    public PrivateEndpoint privateEndpoint() {
+    public ConnectionPropertiesPrivateEndpoint privateEndpoint() {
         return this.privateEndpoint;
     }
 
     /**
-     * Set the privateEndpoint property: The private endpoint property of a private endpoint connection.
+     * Set the privateEndpoint property: The privateEndpoint property.
      *
      * @param privateEndpoint the privateEndpoint value to set.
      * @return the ConnectionProperties object itself.
      */
-    public ConnectionProperties withPrivateEndpoint(PrivateEndpoint privateEndpoint) {
+    public ConnectionProperties withPrivateEndpoint(ConnectionPropertiesPrivateEndpoint privateEndpoint) {
         this.privateEndpoint = privateEndpoint;
         return this;
     }
@@ -89,22 +89,22 @@ public ConnectionProperties withGroupIds(List<String> groupIds) {
     }
 
     /**
-     * Get the privateLinkServiceConnectionState property: The current state of a private endpoint connection.
+     * Get the privateLinkServiceConnectionState property: The privateLinkServiceConnectionState property.
      *
      * @return the privateLinkServiceConnectionState value.
      */
-    public ConnectionState privateLinkServiceConnectionState() {
+    public ConnectionPropertiesPrivateLinkServiceConnectionState privateLinkServiceConnectionState() {
         return this.privateLinkServiceConnectionState;
     }
 
     /**
-     * Set the privateLinkServiceConnectionState property: The current state of a private endpoint connection.
+     * Set the privateLinkServiceConnectionState property: The privateLinkServiceConnectionState property.
      *
      * @param privateLinkServiceConnectionState the privateLinkServiceConnectionState value to set.
      * @return the ConnectionProperties object itself.
      */
     public ConnectionProperties withPrivateLinkServiceConnectionState(
-        ConnectionState privateLinkServiceConnectionState) {
+        ConnectionPropertiesPrivateLinkServiceConnectionState privateLinkServiceConnectionState) {
         this.privateLinkServiceConnectionState = privateLinkServiceConnectionState;
         return this;
     }
diff --git a/sdk/digitaltwins/azure-resourcemanager-digitaltwins/src/main/java/com/azure/resourcemanager/digitaltwins/models/GroupIdInformation.java b/sdk/digitaltwins/azure-resourcemanager-digitaltwins/src/main/java/com/azure/resourcemanager/digitaltwins/models/GroupIdInformation.java
index 5e04b2b5220c..9a6cec43ed56 100644
--- a/sdk/digitaltwins/azure-resourcemanager-digitaltwins/src/main/java/com/azure/resourcemanager/digitaltwins/models/GroupIdInformation.java
+++ b/sdk/digitaltwins/azure-resourcemanager-digitaltwins/src/main/java/com/azure/resourcemanager/digitaltwins/models/GroupIdInformation.java
@@ -9,7 +9,7 @@
 /** An immutable client-side representation of GroupIdInformation. */
 public interface GroupIdInformation {
     /**
-     * Gets the properties property: The properties for a group information object.
+     * Gets the properties property: The properties property.
      *
      * @return the properties value.
      */
diff --git a/sdk/digitaltwins/azure-resourcemanager-digitaltwins/src/main/java/com/azure/resourcemanager/digitaltwins/models/GroupIdInformationProperties.java b/sdk/digitaltwins/azure-resourcemanager-digitaltwins/src/main/java/com/azure/resourcemanager/digitaltwins/models/GroupIdInformationProperties.java
index ed94b1594b29..346b9103131e 100644
--- a/sdk/digitaltwins/azure-resourcemanager-digitaltwins/src/main/java/com/azure/resourcemanager/digitaltwins/models/GroupIdInformationProperties.java
+++ b/sdk/digitaltwins/azure-resourcemanager-digitaltwins/src/main/java/com/azure/resourcemanager/digitaltwins/models/GroupIdInformationProperties.java
@@ -4,92 +4,34 @@
 
 package com.azure.resourcemanager.digitaltwins.models;
 
-import com.azure.core.annotation.Fluent;
+import com.azure.core.annotation.Immutable;
 import com.azure.core.util.logging.ClientLogger;
 import com.fasterxml.jackson.annotation.JsonIgnore;
-import com.fasterxml.jackson.annotation.JsonProperty;
 import java.util.List;
 
-/** The properties for a group information object. */
-@Fluent
-public class GroupIdInformationProperties {
+/** The GroupIdInformationProperties model. */
+@Immutable
+public final class GroupIdInformationProperties extends GroupIdInformationPropertiesAutoGenerated {
     @JsonIgnore private final ClientLogger logger = new ClientLogger(GroupIdInformationProperties.class);
 
-    /*
-     * The group id
-     */
-    @JsonProperty(value = "groupId")
-    private String groupId;
-
-    /*
-     * The required members for a specific group id.
-     */
-    @JsonProperty(value = "requiredMembers")
-    private List<String> requiredMembers;
-
-    /*
-     * The required DNS zones for a specific group id.
-     */
-    @JsonProperty(value = "requiredZoneNames")
-    private List<String> requiredZoneNames;
-
-    /**
-     * Get the groupId property: The group id.
-     *
-     * @return the groupId value.
-     */
-    public String groupId() {
-        return this.groupId;
-    }
-
-    /**
-     * Set the groupId property: The group id.
-     *
-     * @param groupId the groupId value to set.
-     * @return the GroupIdInformationProperties object itself.
-     */
+    /** {@inheritDoc} */
+    @Override
     public GroupIdInformationProperties withGroupId(String groupId) {
-        this.groupId = groupId;
+        super.withGroupId(groupId);
         return this;
     }
 
-    /**
-     * Get the requiredMembers property: The required members for a specific group id.
-     *
-     * @return the requiredMembers value.
-     */
-    public List<String> requiredMembers() {
-        return this.requiredMembers;
-    }
-
-    /**
-     * Set the requiredMembers property: The required members for a specific group id.
-     *
-     * @param requiredMembers the requiredMembers value to set.
-     * @return the GroupIdInformationProperties object itself.
-     */
+    /** {@inheritDoc} */
+    @Override
     public GroupIdInformationProperties withRequiredMembers(List<String> requiredMembers) {
-        this.requiredMembers = requiredMembers;
+        super.withRequiredMembers(requiredMembers);
         return this;
     }
 
-    /**
-     * Get the requiredZoneNames property: The required DNS zones for a specific group id.
-     *
-     * @return the requiredZoneNames value.
-     */
-    public List<String> requiredZoneNames() {
-        return this.requiredZoneNames;
-    }
-
-    /**
-     * Set the requiredZoneNames property: The required DNS zones for a specific group id.
-     *
-     * @param requiredZoneNames the requiredZoneNames value to set.
-     * @return the GroupIdInformationProperties object itself.
-     */
+    /** {@inheritDoc} */
+    @Override
     public GroupIdInformationProperties withRequiredZoneNames(List<String> requiredZoneNames) {
-        this.requiredZoneNames = requiredZoneNames;
+        super.withRequiredZoneNames(requiredZoneNames);
         return this;
     }
 
@@ -98,6 +40,8 @@ public GroupIdInformationProperties withRequiredZoneNames(List<String> requiredZ
      *
      * @throws IllegalArgumentException thrown if the instance is not valid.
      */
+    @Override
     public void validate() {
+        super.validate();
     }
 }
diff --git a/sdk/digitaltwins/azure-resourcemanager-digitaltwins/src/main/java/com/azure/resourcemanager/digitaltwins/models/GroupIdInformationPropertiesAutoGenerated.java b/sdk/digitaltwins/azure-resourcemanager-digitaltwins/src/main/java/com/azure/resourcemanager/digitaltwins/models/GroupIdInformationPropertiesAutoGenerated.java
new file mode 100644
index 000000000000..b863c9acaf50
--- /dev/null
+++ b/sdk/digitaltwins/azure-resourcemanager-digitaltwins/src/main/java/com/azure/resourcemanager/digitaltwins/models/GroupIdInformationPropertiesAutoGenerated.java
@@ -0,0 +1,103 @@
+// Copyright (c) Microsoft Corporation. All rights reserved.
+// Licensed under the MIT License.
+// Code generated by Microsoft (R) AutoRest Code Generator.
+
+package com.azure.resourcemanager.digitaltwins.models;
+
+import com.azure.core.annotation.Fluent;
+import com.azure.core.util.logging.ClientLogger;
+import com.fasterxml.jackson.annotation.JsonIgnore;
+import com.fasterxml.jackson.annotation.JsonProperty;
+import java.util.List;
+
+/** The properties for a group information object. */
+@Fluent
+public class GroupIdInformationPropertiesAutoGenerated {
+    @JsonIgnore private final ClientLogger logger = new ClientLogger(GroupIdInformationPropertiesAutoGenerated.class);
+
+    /*
+     * The group id
+     */
+    @JsonProperty(value = "groupId")
+    private String groupId;
+
+    /*
+     * The required members for a specific group id.
+     */
+    @JsonProperty(value = "requiredMembers")
+    private List<String> requiredMembers;
+
+    /*
+     * The required DNS zones for a specific group id.
+     */
+    @JsonProperty(value = "requiredZoneNames")
+    private List<String> requiredZoneNames;
+
+    /**
+     * Get the groupId property: The group id.
+     *
+     * @return the groupId value.
+     */
+    public String groupId() {
+        return this.groupId;
+    }
+
+    /**
+     * Set the groupId property: The group id.
+     *
+     * @param groupId the groupId value to set.
+     * @return the GroupIdInformationPropertiesAutoGenerated object itself.
+     */
+    public GroupIdInformationPropertiesAutoGenerated withGroupId(String groupId) {
+        this.groupId = groupId;
+        return this;
+    }
+
+    /**
+     * Get the requiredMembers property: The required members for a specific group id.
+     *
+     * @return the requiredMembers value.
+     */
+    public List<String> requiredMembers() {
+        return this.requiredMembers;
+    }
+
+    /**
+     * Set the requiredMembers property: The required members for a specific group id.
+     *
+     * @param requiredMembers the requiredMembers value to set.
+     * @return the GroupIdInformationPropertiesAutoGenerated object itself.
+     */
+    public GroupIdInformationPropertiesAutoGenerated withRequiredMembers(List<String> requiredMembers) {
+        this.requiredMembers = requiredMembers;
+        return this;
+    }
+
+    /**
+     * Get the requiredZoneNames property: The required DNS zones for a specific group id.
+     *
+     * @return the requiredZoneNames value.
+     */
+    public List<String> requiredZoneNames() {
+        return this.requiredZoneNames;
+    }
+
+    /**
+     * Set the requiredZoneNames property: The required DNS zones for a specific group id.
+     *
+     * @param requiredZoneNames the requiredZoneNames value to set.
+     * @return the GroupIdInformationPropertiesAutoGenerated object itself.
+     */
+    public GroupIdInformationPropertiesAutoGenerated withRequiredZoneNames(List<String> requiredZoneNames) {
+        this.requiredZoneNames = requiredZoneNames;
+        return this;
+    }
+
+    /**
+     * Validates the instance.
+     *
+     * @throws IllegalArgumentException thrown if the instance is not valid.
+     */
+    public void validate() {
+    }
+}
diff --git a/sdk/digitaltwins/azure-resourcemanager-digitaltwins/src/main/java/com/azure/resourcemanager/digitaltwins/models/PrivateEndpointConnection.java b/sdk/digitaltwins/azure-resourcemanager-digitaltwins/src/main/java/com/azure/resourcemanager/digitaltwins/models/PrivateEndpointConnection.java
index 5e9b88d1e94d..bcf6555ad6b1 100644
--- a/sdk/digitaltwins/azure-resourcemanager-digitaltwins/src/main/java/com/azure/resourcemanager/digitaltwins/models/PrivateEndpointConnection.java
+++ b/sdk/digitaltwins/azure-resourcemanager-digitaltwins/src/main/java/com/azure/resourcemanager/digitaltwins/models/PrivateEndpointConnection.java
@@ -31,11 +31,11 @@ public interface PrivateEndpointConnection {
     String type();
 
     /**
-     * Gets the properties property: The properties of a private endpoint connection.
+     * Gets the properties property: The properties property.
      *
      * @return the properties value.
      */
-    ConnectionProperties properties();
+    PrivateEndpointConnectionProperties properties();
 
     /**
      * Gets the inner com.azure.resourcemanager.digitaltwins.fluent.models.PrivateEndpointConnectionInner object.
@@ -70,12 +70,12 @@ interface WithParentResource {
         /** The stage of the PrivateEndpointConnection definition allowing to specify properties. */
         interface WithProperties {
             /**
-             * Specifies the properties property: The properties of a private endpoint connection..
+             * Specifies the properties property: The properties property..
              *
-             * @param properties The properties of a private endpoint connection.
+             * @param properties The properties property.
              * @return the next definition stage.
              */
-            WithCreate withProperties(ConnectionProperties properties);
+            WithCreate withProperties(PrivateEndpointConnectionProperties properties);
         }
         /**
          * The stage of the PrivateEndpointConnection definition which contains all the minimum required properties for
@@ -127,12 +127,12 @@ interface UpdateStages {
         /** The stage of the PrivateEndpointConnection update allowing to specify properties. */
         interface WithProperties {
             /**
-             * Specifies the properties property: The properties of a private endpoint connection..
+             * Specifies the properties property: The properties property..
              *
-             * @param properties The properties of a private endpoint connection.
+             * @param properties The properties property.
              * @return the next definition stage.
              */
-            Update withProperties(ConnectionProperties properties);
+            Update withProperties(PrivateEndpointConnectionProperties properties);
         }
     }
     /**
diff --git a/sdk/digitaltwins/azure-resourcemanager-digitaltwins/src/main/java/com/azure/resourcemanager/digitaltwins/models/PrivateEndpointConnectionProperties.java b/sdk/digitaltwins/azure-resourcemanager-digitaltwins/src/main/java/com/azure/resourcemanager/digitaltwins/models/PrivateEndpointConnectionProperties.java
index 77e388ec2e4f..0139336c057f 100644
--- a/sdk/digitaltwins/azure-resourcemanager-digitaltwins/src/main/java/com/azure/resourcemanager/digitaltwins/models/PrivateEndpointConnectionProperties.java
+++ b/sdk/digitaltwins/azure-resourcemanager-digitaltwins/src/main/java/com/azure/resourcemanager/digitaltwins/models/PrivateEndpointConnectionProperties.java
@@ -16,7 +16,8 @@ public final class PrivateEndpointConnectionProperties extends ConnectionPropert
 
     /** {@inheritDoc} */
     @Override
-    public PrivateEndpointConnectionProperties withPrivateEndpoint(PrivateEndpoint privateEndpoint) {
+    public PrivateEndpointConnectionProperties withPrivateEndpoint(
+        ConnectionPropertiesPrivateEndpoint privateEndpoint) {
         super.withPrivateEndpoint(privateEndpoint);
         return this;
     }
@@ -31,7 +32,7 @@ public PrivateEndpointConnectionProperties withGroupIds(List<String> groupIds) {
     /** {@inheritDoc} */
     @Override
     public PrivateEndpointConnectionProperties withPrivateLinkServiceConnectionState(
-        ConnectionState privateLinkServiceConnectionState) {
+        ConnectionPropertiesPrivateLinkServiceConnectionState privateLinkServiceConnectionState) {
         super.withPrivateLinkServiceConnectionState(privateLinkServiceConnectionState);
         return this;
     }