diff --git a/src/AzureDataFactory.TestingFramework/AzureDataFactory.TestingFramework.csproj b/src/AzureDataFactory.TestingFramework/AzureDataFactory.TestingFramework.csproj
index e591008e..05ea5bd2 100644
--- a/src/AzureDataFactory.TestingFramework/AzureDataFactory.TestingFramework.csproj
+++ b/src/AzureDataFactory.TestingFramework/AzureDataFactory.TestingFramework.csproj
@@ -16,7 +16,7 @@
 
     <PropertyGroup>
         <PackageId>AzureDataFactory.TestingFramework</PackageId>
-        <PackageVersion>0.1.0-alpha</PackageVersion>
+        <PackageVersion>0.1.1-alpha</PackageVersion>
         <Authors>arjendev</Authors>
         <GeneratePackageOnBuild>true</GeneratePackageOnBuild>
     </PropertyGroup>
diff --git a/src/AzureDataFactory.TestingFramework/Generated/DataFactoryChangeDataCaptureData.cs b/src/AzureDataFactory.TestingFramework/Generated/DataFactoryChangeDataCaptureData.cs
index 2f69cedd..7bf8471b 100644
--- a/src/AzureDataFactory.TestingFramework/Generated/DataFactoryChangeDataCaptureData.cs
+++ b/src/AzureDataFactory.TestingFramework/Generated/DataFactoryChangeDataCaptureData.cs
@@ -6,6 +6,7 @@
 #nullable disable
 
 using Azure.Core;
+using Azure.Core.Expressions.DataFactory;
 using AzureDataFactory.TestingFramework.Models;
 using Azure.ResourceManager.Models;
 
@@ -31,7 +32,7 @@ public DataFactoryChangeDataCaptureData(IEnumerable<MapperSourceConnectionsInfo>
             SourceConnectionsInfo = sourceConnectionsInfo.ToList();
             TargetConnectionsInfo = targetConnectionsInfo.ToList();
             Policy = policy;
-            AdditionalProperties = new ChangeTrackingDictionary<string, BinaryData>();
+            AdditionalProperties = new ChangeTrackingDictionary<string, DataFactoryElement<string>>();
         }
 
         /// <summary> Initializes a new instance of DataFactoryChangeDataCaptureData. </summary>
@@ -48,7 +49,7 @@ public DataFactoryChangeDataCaptureData(IEnumerable<MapperSourceConnectionsInfo>
         /// <param name="status"> Status of the CDC as to if it is running or stopped. </param>
         /// <param name="eTag"> Etag identifies change in the resource. </param>
         /// <param name="additionalProperties"> Additional Properties. </param>
-        internal DataFactoryChangeDataCaptureData(ResourceIdentifier id, string name, ResourceType resourceType, SystemData systemData, ChangeDataCaptureFolder folder, string description, IList<MapperSourceConnectionsInfo> sourceConnectionsInfo, IList<MapperTargetConnectionsInfo> targetConnectionsInfo, MapperPolicy policy, bool? allowVnetOverride, string status, ETag? eTag, IDictionary<string, BinaryData> additionalProperties) : base(id, name, resourceType, systemData)
+        internal DataFactoryChangeDataCaptureData(ResourceIdentifier id, string name, ResourceType resourceType, SystemData systemData, ChangeDataCaptureFolder folder, string description, IList<MapperSourceConnectionsInfo> sourceConnectionsInfo, IList<MapperTargetConnectionsInfo> targetConnectionsInfo, MapperPolicy policy, bool? allowVnetOverride, string status, ETag? eTag, IDictionary<string, DataFactoryElement<string>> additionalProperties) : base(id, name, resourceType, systemData)
         {
             Folder = folder;
             Description = description;
@@ -119,6 +120,6 @@ public string FolderName
         /// </list>
         /// </para>
         /// </summary>
-        public IDictionary<string, BinaryData> AdditionalProperties { get; }
+        public IDictionary<string, DataFactoryElement<string>> AdditionalProperties { get; }
     }
 }
diff --git a/src/AzureDataFactory.TestingFramework/Generated/DataFactoryData.cs b/src/AzureDataFactory.TestingFramework/Generated/DataFactoryData.cs
index f888090c..ae7f1964 100644
--- a/src/AzureDataFactory.TestingFramework/Generated/DataFactoryData.cs
+++ b/src/AzureDataFactory.TestingFramework/Generated/DataFactoryData.cs
@@ -6,6 +6,7 @@
 #nullable disable
 
 using Azure.Core;
+using Azure.Core.Expressions.DataFactory;
 using AzureDataFactory.TestingFramework.Models;
 using Azure.ResourceManager.Models;
 
@@ -22,7 +23,7 @@ public partial class DataFactoryData : TrackedResourceData
         public DataFactoryData(AzureLocation location) : base(location)
         {
             GlobalParameters = new ChangeTrackingDictionary<string, DataFactoryGlobalParameterProperties>();
-            AdditionalProperties = new ChangeTrackingDictionary<string, BinaryData>();
+            AdditionalProperties = new ChangeTrackingDictionary<string, DataFactoryElement<string>>();
         }
 
         /// <summary> Initializes a new instance of DataFactoryData. </summary>
@@ -47,7 +48,7 @@ public DataFactoryData(AzureLocation location) : base(location)
         /// <param name="publicNetworkAccess"> Whether or not public network access is allowed for the data factory. </param>
         /// <param name="eTag"> Etag identifies change in the resource. </param>
         /// <param name="additionalProperties"> Additional Properties. </param>
-        internal DataFactoryData(ResourceIdentifier id, string name, ResourceType resourceType, SystemData systemData, IDictionary<string, string> tags, AzureLocation location, ManagedServiceIdentity identity, string provisioningState, DateTimeOffset? createdOn, string version, DataFactoryPurviewConfiguration purviewConfiguration, FactoryRepoConfiguration repoConfiguration, IDictionary<string, DataFactoryGlobalParameterProperties> globalParameters, DataFactoryEncryptionConfiguration encryption, DataFactoryPublicNetworkAccess? publicNetworkAccess, ETag? eTag, IDictionary<string, BinaryData> additionalProperties) : base(id, name, resourceType, systemData, tags, location)
+        internal DataFactoryData(ResourceIdentifier id, string name, ResourceType resourceType, SystemData systemData, IDictionary<string, string> tags, AzureLocation location, ManagedServiceIdentity identity, string provisioningState, DateTimeOffset? createdOn, string version, DataFactoryPurviewConfiguration purviewConfiguration, FactoryRepoConfiguration repoConfiguration, IDictionary<string, DataFactoryGlobalParameterProperties> globalParameters, DataFactoryEncryptionConfiguration encryption, DataFactoryPublicNetworkAccess? publicNetworkAccess, ETag? eTag, IDictionary<string, DataFactoryElement<string>> additionalProperties) : base(id, name, resourceType, systemData, tags, location)
         {
             Identity = identity;
             ProvisioningState = provisioningState;
@@ -128,6 +129,6 @@ public ResourceIdentifier PurviewResourceId
         /// </list>
         /// </para>
         /// </summary>
-        public IDictionary<string, BinaryData> AdditionalProperties { get; }
+        public IDictionary<string, DataFactoryElement<string>> AdditionalProperties { get; }
     }
 }
diff --git a/src/AzureDataFactory.TestingFramework/Generated/DataFactoryPipelineResource.cs b/src/AzureDataFactory.TestingFramework/Generated/DataFactoryPipelineResource.cs
index d983cd31..bcae0f4c 100644
--- a/src/AzureDataFactory.TestingFramework/Generated/DataFactoryPipelineResource.cs
+++ b/src/AzureDataFactory.TestingFramework/Generated/DataFactoryPipelineResource.cs
@@ -7,6 +7,7 @@
 
 using System.Globalization;
 using Azure.Core;
+using Azure.Core.Expressions.DataFactory;
 using Azure.Core.Pipeline;
 using AzureDataFactory.TestingFramework.Models;
 
@@ -313,7 +314,7 @@ public virtual ArmOperation<DataFactoryPipelineResource> Update(WaitUntil waitUn
         /// <param name="startActivityName"> In recovery mode, the rerun will start from this activity. If not specified, all activities will run. </param>
         /// <param name="startFromFailure"> In recovery mode, if set to true, the rerun will start from failed activities. The property will be used only if startActivityName is not specified. </param>
         /// <param name="cancellationToken"> The cancellation token to use. </param>
-        public virtual async Task<Response<PipelineCreateRunResult>> CreateRunAsync(IDictionary<string, BinaryData> parameterValueSpecification = null, string referencePipelineRunId = null, bool? isRecovery = null, string startActivityName = null, bool? startFromFailure = null, CancellationToken cancellationToken = default)
+        public virtual async Task<Response<PipelineCreateRunResult>> CreateRunAsync(IDictionary<string, DataFactoryElement<string>> parameterValueSpecification = null, string referencePipelineRunId = null, bool? isRecovery = null, string startActivityName = null, bool? startFromFailure = null, CancellationToken cancellationToken = default)
         {
             using var scope = _dataFactoryPipelinePipelinesClientDiagnostics.CreateScope("DataFactoryPipelineResource.CreateRun");
             scope.Start();
@@ -348,7 +349,7 @@ public virtual async Task<Response<PipelineCreateRunResult>> CreateRunAsync(IDic
         /// <param name="startActivityName"> In recovery mode, the rerun will start from this activity. If not specified, all activities will run. </param>
         /// <param name="startFromFailure"> In recovery mode, if set to true, the rerun will start from failed activities. The property will be used only if startActivityName is not specified. </param>
         /// <param name="cancellationToken"> The cancellation token to use. </param>
-        public virtual Response<PipelineCreateRunResult> CreateRun(IDictionary<string, BinaryData> parameterValueSpecification = null, string referencePipelineRunId = null, bool? isRecovery = null, string startActivityName = null, bool? startFromFailure = null, CancellationToken cancellationToken = default)
+        public virtual Response<PipelineCreateRunResult> CreateRun(IDictionary<string, DataFactoryElement<string>> parameterValueSpecification = null, string referencePipelineRunId = null, bool? isRecovery = null, string startActivityName = null, bool? startFromFailure = null, CancellationToken cancellationToken = default)
         {
             using var scope = _dataFactoryPipelinePipelinesClientDiagnostics.CreateScope("DataFactoryPipelineResource.CreateRun");
             scope.Start();
diff --git a/src/AzureDataFactory.TestingFramework/Generated/Models/AmazonMwsLinkedService.Serialization.cs b/src/AzureDataFactory.TestingFramework/Generated/Models/AmazonMwsLinkedService.Serialization.cs
index ab0ac6e2..9af9ebf8 100644
--- a/src/AzureDataFactory.TestingFramework/Generated/Models/AmazonMwsLinkedService.Serialization.cs
+++ b/src/AzureDataFactory.TestingFramework/Generated/Models/AmazonMwsLinkedService.Serialization.cs
@@ -132,8 +132,8 @@ internal static AmazonMwsLinkedService DeserializeAmazonMwsLinkedService(JsonEle
             Optional<DataFactoryElement<bool>> useHostVerification = default;
             Optional<DataFactoryElement<bool>> usePeerVerification = default;
             Optional<string> encryptedCredential = default;
-            IDictionary<string, BinaryData> additionalProperties = default;
-            Dictionary<string, BinaryData> additionalPropertiesDictionary = new Dictionary<string, BinaryData>();
+            IDictionary<string, DataFactoryElement<string>> additionalProperties = default;
+            Dictionary<string, DataFactoryElement<string>> additionalPropertiesDictionary = new Dictionary<string, DataFactoryElement<string>>();
             foreach (var property in element.EnumerateObject())
             {
                 if (property.NameEquals("type"u8))
@@ -272,7 +272,7 @@ internal static AmazonMwsLinkedService DeserializeAmazonMwsLinkedService(JsonEle
                     }
                     continue;
                 }
-                additionalPropertiesDictionary.Add(property.Name, BinaryData.FromString(property.Value.GetRawText()));
+                additionalPropertiesDictionary.Add(property.Name, JsonSerializer.Deserialize<DataFactoryElement<string>>(property.Value.GetRawText()));
             }
             additionalProperties = additionalPropertiesDictionary;
             return new AmazonMwsLinkedService(type, connectVia.Value, description.Value, Optional.ToDictionary(parameters), Optional.ToList(annotations), additionalProperties, endpoint, marketplaceId, sellerId, mwsAuthToken, accessKeyId, secretKey, useEncryptedEndpoints.Value, useHostVerification.Value, usePeerVerification.Value, encryptedCredential.Value);
diff --git a/src/AzureDataFactory.TestingFramework/Generated/Models/AmazonMwsLinkedService.cs b/src/AzureDataFactory.TestingFramework/Generated/Models/AmazonMwsLinkedService.cs
index 0fdd409f..2bc13359 100644
--- a/src/AzureDataFactory.TestingFramework/Generated/Models/AmazonMwsLinkedService.cs
+++ b/src/AzureDataFactory.TestingFramework/Generated/Models/AmazonMwsLinkedService.cs
@@ -50,7 +50,7 @@ public AmazonMwsLinkedService(DataFactoryElement<string> endpoint, DataFactoryEl
         /// <param name="useHostVerification"> Specifies whether to require the host name in the server's certificate to match the host name of the server when connecting over SSL. The default value is true. </param>
         /// <param name="usePeerVerification"> Specifies whether to verify the identity of the server when connecting over SSL. The default value is true. </param>
         /// <param name="encryptedCredential"> The encrypted credential used for authentication. Credentials are encrypted using the integration runtime credential manager. Type: string. </param>
-        internal AmazonMwsLinkedService(string linkedServiceType, IntegrationRuntimeReference connectVia, string description, IDictionary<string, EntityParameterSpecification> parameters, IList<BinaryData> annotations, IDictionary<string, BinaryData> additionalProperties, DataFactoryElement<string> endpoint, DataFactoryElement<string> marketplaceId, DataFactoryElement<string> sellerId, DataFactorySecretBaseDefinition mwsAuthToken, DataFactoryElement<string> accessKeyId, DataFactorySecretBaseDefinition secretKey, DataFactoryElement<bool> useEncryptedEndpoints, DataFactoryElement<bool> useHostVerification, DataFactoryElement<bool> usePeerVerification, string encryptedCredential) : base(linkedServiceType, connectVia, description, parameters, annotations, additionalProperties)
+        internal AmazonMwsLinkedService(string linkedServiceType, IntegrationRuntimeReference connectVia, string description, IDictionary<string, EntityParameterSpecification> parameters, IList<BinaryData> annotations, IDictionary<string, DataFactoryElement<string>> additionalProperties, DataFactoryElement<string> endpoint, DataFactoryElement<string> marketplaceId, DataFactoryElement<string> sellerId, DataFactorySecretBaseDefinition mwsAuthToken, DataFactoryElement<string> accessKeyId, DataFactorySecretBaseDefinition secretKey, DataFactoryElement<bool> useEncryptedEndpoints, DataFactoryElement<bool> useHostVerification, DataFactoryElement<bool> usePeerVerification, string encryptedCredential) : base(linkedServiceType, connectVia, description, parameters, annotations, additionalProperties)
         {
             Endpoint = endpoint;
             MarketplaceId = marketplaceId;
diff --git a/src/AzureDataFactory.TestingFramework/Generated/Models/AmazonMwsObjectDataset.Serialization.cs b/src/AzureDataFactory.TestingFramework/Generated/Models/AmazonMwsObjectDataset.Serialization.cs
index 38741867..c38e43ee 100644
--- a/src/AzureDataFactory.TestingFramework/Generated/Models/AmazonMwsObjectDataset.Serialization.cs
+++ b/src/AzureDataFactory.TestingFramework/Generated/Models/AmazonMwsObjectDataset.Serialization.cs
@@ -104,8 +104,8 @@ internal static AmazonMwsObjectDataset DeserializeAmazonMwsObjectDataset(JsonEle
             Optional<IList<BinaryData>> annotations = default;
             Optional<DatasetFolder> folder = default;
             Optional<DataFactoryElement<string>> tableName = default;
-            IDictionary<string, BinaryData> additionalProperties = default;
-            Dictionary<string, BinaryData> additionalPropertiesDictionary = new Dictionary<string, BinaryData>();
+            IDictionary<string, DataFactoryElement<string>> additionalProperties = default;
+            Dictionary<string, DataFactoryElement<string>> additionalPropertiesDictionary = new Dictionary<string, DataFactoryElement<string>>();
             foreach (var property in element.EnumerateObject())
             {
                 if (property.NameEquals("type"u8))
@@ -206,7 +206,7 @@ internal static AmazonMwsObjectDataset DeserializeAmazonMwsObjectDataset(JsonEle
                     }
                     continue;
                 }
-                additionalPropertiesDictionary.Add(property.Name, BinaryData.FromString(property.Value.GetRawText()));
+                additionalPropertiesDictionary.Add(property.Name, JsonSerializer.Deserialize<DataFactoryElement<string>>(property.Value.GetRawText()));
             }
             additionalProperties = additionalPropertiesDictionary;
             return new AmazonMwsObjectDataset(type, description.Value, structure.Value, schema.Value, linkedServiceName, Optional.ToDictionary(parameters), Optional.ToList(annotations), folder.Value, additionalProperties, tableName.Value);
diff --git a/src/AzureDataFactory.TestingFramework/Generated/Models/AmazonMwsObjectDataset.cs b/src/AzureDataFactory.TestingFramework/Generated/Models/AmazonMwsObjectDataset.cs
index 95c7e081..ddf48559 100644
--- a/src/AzureDataFactory.TestingFramework/Generated/Models/AmazonMwsObjectDataset.cs
+++ b/src/AzureDataFactory.TestingFramework/Generated/Models/AmazonMwsObjectDataset.cs
@@ -34,7 +34,7 @@ public AmazonMwsObjectDataset(DataFactoryLinkedServiceReference linkedServiceNam
         /// <param name="folder"> The folder that this Dataset is in. If not specified, Dataset will appear at the root level. </param>
         /// <param name="additionalProperties"> Additional Properties. </param>
         /// <param name="tableName"> The table name. Type: string (or Expression with resultType string). </param>
-        internal AmazonMwsObjectDataset(string datasetType, string description, DataFactoryElement<IList<DatasetDataElement>> structure, DataFactoryElement<IList<DatasetSchemaDataElement>> schema, DataFactoryLinkedServiceReference linkedServiceName, IDictionary<string, EntityParameterSpecification> parameters, IList<BinaryData> annotations, DatasetFolder folder, IDictionary<string, BinaryData> additionalProperties, DataFactoryElement<string> tableName) : base(datasetType, description, structure, schema, linkedServiceName, parameters, annotations, folder, additionalProperties)
+        internal AmazonMwsObjectDataset(string datasetType, string description, DataFactoryElement<IList<DatasetDataElement>> structure, DataFactoryElement<IList<DatasetSchemaDataElement>> schema, DataFactoryLinkedServiceReference linkedServiceName, IDictionary<string, EntityParameterSpecification> parameters, IList<BinaryData> annotations, DatasetFolder folder, IDictionary<string, DataFactoryElement<string>> additionalProperties, DataFactoryElement<string> tableName) : base(datasetType, description, structure, schema, linkedServiceName, parameters, annotations, folder, additionalProperties)
         {
             TableName = tableName;
             DatasetType = datasetType ?? "AmazonMWSObject";
diff --git a/src/AzureDataFactory.TestingFramework/Generated/Models/AmazonMwsSource.Serialization.cs b/src/AzureDataFactory.TestingFramework/Generated/Models/AmazonMwsSource.Serialization.cs
index 68fc0544..0bd30e81 100644
--- a/src/AzureDataFactory.TestingFramework/Generated/Models/AmazonMwsSource.Serialization.cs
+++ b/src/AzureDataFactory.TestingFramework/Generated/Models/AmazonMwsSource.Serialization.cs
@@ -83,8 +83,8 @@ internal static AmazonMwsSource DeserializeAmazonMwsSource(JsonElement element)
             Optional<DataFactoryElement<string>> sourceRetryWait = default;
             Optional<DataFactoryElement<int>> maxConcurrentConnections = default;
             Optional<DataFactoryElement<bool>> disableMetricsCollection = default;
-            IDictionary<string, BinaryData> additionalProperties = default;
-            Dictionary<string, BinaryData> additionalPropertiesDictionary = new Dictionary<string, BinaryData>();
+            IDictionary<string, DataFactoryElement<string>> additionalProperties = default;
+            Dictionary<string, DataFactoryElement<string>> additionalPropertiesDictionary = new Dictionary<string, DataFactoryElement<string>>();
             foreach (var property in element.EnumerateObject())
             {
                 if (property.NameEquals("query"u8))
@@ -155,7 +155,7 @@ internal static AmazonMwsSource DeserializeAmazonMwsSource(JsonElement element)
                     disableMetricsCollection = JsonSerializer.Deserialize<DataFactoryElement<bool>>(property.Value.GetRawText());
                     continue;
                 }
-                additionalPropertiesDictionary.Add(property.Name, BinaryData.FromString(property.Value.GetRawText()));
+                additionalPropertiesDictionary.Add(property.Name, JsonSerializer.Deserialize<DataFactoryElement<string>>(property.Value.GetRawText()));
             }
             additionalProperties = additionalPropertiesDictionary;
             return new AmazonMwsSource(type, sourceRetryCount.Value, sourceRetryWait.Value, maxConcurrentConnections.Value, disableMetricsCollection.Value, additionalProperties, queryTimeout.Value, additionalColumns.Value, query.Value);
diff --git a/src/AzureDataFactory.TestingFramework/Generated/Models/AmazonMwsSource.cs b/src/AzureDataFactory.TestingFramework/Generated/Models/AmazonMwsSource.cs
index 804c0fad..bd34826d 100644
--- a/src/AzureDataFactory.TestingFramework/Generated/Models/AmazonMwsSource.cs
+++ b/src/AzureDataFactory.TestingFramework/Generated/Models/AmazonMwsSource.cs
@@ -28,7 +28,7 @@ public AmazonMwsSource()
         /// <param name="queryTimeout"> Query timeout. Type: string (or Expression with resultType string), pattern: ((\d+)\.)?(\d\d):(60|([0-5][0-9])):(60|([0-5][0-9])). </param>
         /// <param name="additionalColumns"> Specifies the additional columns to be added to source data. Type: array of objects(AdditionalColumns) (or Expression with resultType array of objects). </param>
         /// <param name="query"> A query to retrieve data from source. Type: string (or Expression with resultType string). </param>
-        internal AmazonMwsSource(string copySourceType, DataFactoryElement<int> sourceRetryCount, DataFactoryElement<string> sourceRetryWait, DataFactoryElement<int> maxConcurrentConnections, DataFactoryElement<bool> disableMetricsCollection, IDictionary<string, BinaryData> additionalProperties, DataFactoryElement<string> queryTimeout, BinaryData additionalColumns, DataFactoryElement<string> query) : base(copySourceType, sourceRetryCount, sourceRetryWait, maxConcurrentConnections, disableMetricsCollection, additionalProperties, queryTimeout, additionalColumns)
+        internal AmazonMwsSource(string copySourceType, DataFactoryElement<int> sourceRetryCount, DataFactoryElement<string> sourceRetryWait, DataFactoryElement<int> maxConcurrentConnections, DataFactoryElement<bool> disableMetricsCollection, IDictionary<string, DataFactoryElement<string>> additionalProperties, DataFactoryElement<string> queryTimeout, BinaryData additionalColumns, DataFactoryElement<string> query) : base(copySourceType, sourceRetryCount, sourceRetryWait, maxConcurrentConnections, disableMetricsCollection, additionalProperties, queryTimeout, additionalColumns)
         {
             Query = query;
             CopySourceType = copySourceType ?? "AmazonMWSSource";
diff --git a/src/AzureDataFactory.TestingFramework/Generated/Models/AmazonRdsForOracleLinkedService.Serialization.cs b/src/AzureDataFactory.TestingFramework/Generated/Models/AmazonRdsForOracleLinkedService.Serialization.cs
index ffbbffa8..25b36251 100644
--- a/src/AzureDataFactory.TestingFramework/Generated/Models/AmazonRdsForOracleLinkedService.Serialization.cs
+++ b/src/AzureDataFactory.TestingFramework/Generated/Models/AmazonRdsForOracleLinkedService.Serialization.cs
@@ -99,8 +99,8 @@ internal static AmazonRdsForOracleLinkedService DeserializeAmazonRdsForOracleLin
             DataFactoryElement<string> connectionString = default;
             Optional<DataFactorySecretBaseDefinition> password = default;
             Optional<string> encryptedCredential = default;
-            IDictionary<string, BinaryData> additionalProperties = default;
-            Dictionary<string, BinaryData> additionalPropertiesDictionary = new Dictionary<string, BinaryData>();
+            IDictionary<string, DataFactoryElement<string>> additionalProperties = default;
+            Dictionary<string, DataFactoryElement<string>> additionalPropertiesDictionary = new Dictionary<string, DataFactoryElement<string>>();
             foreach (var property in element.EnumerateObject())
             {
                 if (property.NameEquals("type"u8))
@@ -188,7 +188,7 @@ internal static AmazonRdsForOracleLinkedService DeserializeAmazonRdsForOracleLin
                     }
                     continue;
                 }
-                additionalPropertiesDictionary.Add(property.Name, BinaryData.FromString(property.Value.GetRawText()));
+                additionalPropertiesDictionary.Add(property.Name, JsonSerializer.Deserialize<DataFactoryElement<string>>(property.Value.GetRawText()));
             }
             additionalProperties = additionalPropertiesDictionary;
             return new AmazonRdsForOracleLinkedService(type, connectVia.Value, description.Value, Optional.ToDictionary(parameters), Optional.ToList(annotations), additionalProperties, connectionString, password, encryptedCredential.Value);
diff --git a/src/AzureDataFactory.TestingFramework/Generated/Models/AmazonRdsForOracleLinkedService.cs b/src/AzureDataFactory.TestingFramework/Generated/Models/AmazonRdsForOracleLinkedService.cs
index 82b36826..2d0fbf8f 100644
--- a/src/AzureDataFactory.TestingFramework/Generated/Models/AmazonRdsForOracleLinkedService.cs
+++ b/src/AzureDataFactory.TestingFramework/Generated/Models/AmazonRdsForOracleLinkedService.cs
@@ -34,7 +34,7 @@ public AmazonRdsForOracleLinkedService(DataFactoryElement<string> connectionStri
         /// <param name="connectionString"> The connection string. Type: string, SecureString or AzureKeyVaultSecretReference. </param>
         /// <param name="password"> The Azure key vault secret reference of password in connection string. </param>
         /// <param name="encryptedCredential"> The encrypted credential used for authentication. Credentials are encrypted using the integration runtime credential manager. Type: string. </param>
-        internal AmazonRdsForOracleLinkedService(string linkedServiceType, IntegrationRuntimeReference connectVia, string description, IDictionary<string, EntityParameterSpecification> parameters, IList<BinaryData> annotations, IDictionary<string, BinaryData> additionalProperties, DataFactoryElement<string> connectionString, DataFactorySecretBaseDefinition password, string encryptedCredential) : base(linkedServiceType, connectVia, description, parameters, annotations, additionalProperties)
+        internal AmazonRdsForOracleLinkedService(string linkedServiceType, IntegrationRuntimeReference connectVia, string description, IDictionary<string, EntityParameterSpecification> parameters, IList<BinaryData> annotations, IDictionary<string, DataFactoryElement<string>> additionalProperties, DataFactoryElement<string> connectionString, DataFactorySecretBaseDefinition password, string encryptedCredential) : base(linkedServiceType, connectVia, description, parameters, annotations, additionalProperties)
         {
             ConnectionString = connectionString;
             Password = password;
diff --git a/src/AzureDataFactory.TestingFramework/Generated/Models/AmazonRdsForOracleSource.Serialization.cs b/src/AzureDataFactory.TestingFramework/Generated/Models/AmazonRdsForOracleSource.Serialization.cs
index 83b9b15d..5c5526e2 100644
--- a/src/AzureDataFactory.TestingFramework/Generated/Models/AmazonRdsForOracleSource.Serialization.cs
+++ b/src/AzureDataFactory.TestingFramework/Generated/Models/AmazonRdsForOracleSource.Serialization.cs
@@ -95,8 +95,8 @@ internal static AmazonRdsForOracleSource DeserializeAmazonRdsForOracleSource(Jso
             Optional<DataFactoryElement<string>> sourceRetryWait = default;
             Optional<DataFactoryElement<int>> maxConcurrentConnections = default;
             Optional<DataFactoryElement<bool>> disableMetricsCollection = default;
-            IDictionary<string, BinaryData> additionalProperties = default;
-            Dictionary<string, BinaryData> additionalPropertiesDictionary = new Dictionary<string, BinaryData>();
+            IDictionary<string, DataFactoryElement<string>> additionalProperties = default;
+            Dictionary<string, DataFactoryElement<string>> additionalPropertiesDictionary = new Dictionary<string, DataFactoryElement<string>>();
             foreach (var property in element.EnumerateObject())
             {
                 if (property.NameEquals("oracleReaderQuery"u8))
@@ -185,7 +185,7 @@ internal static AmazonRdsForOracleSource DeserializeAmazonRdsForOracleSource(Jso
                     disableMetricsCollection = JsonSerializer.Deserialize<DataFactoryElement<bool>>(property.Value.GetRawText());
                     continue;
                 }
-                additionalPropertiesDictionary.Add(property.Name, BinaryData.FromString(property.Value.GetRawText()));
+                additionalPropertiesDictionary.Add(property.Name, JsonSerializer.Deserialize<DataFactoryElement<string>>(property.Value.GetRawText()));
             }
             additionalProperties = additionalPropertiesDictionary;
             return new AmazonRdsForOracleSource(type, sourceRetryCount.Value, sourceRetryWait.Value, maxConcurrentConnections.Value, disableMetricsCollection.Value, additionalProperties, oracleReaderQuery.Value, queryTimeout.Value, partitionOption.Value, partitionSettings.Value, additionalColumns.Value);
diff --git a/src/AzureDataFactory.TestingFramework/Generated/Models/AmazonRdsForOracleSource.cs b/src/AzureDataFactory.TestingFramework/Generated/Models/AmazonRdsForOracleSource.cs
index 53c5f78c..800c152f 100644
--- a/src/AzureDataFactory.TestingFramework/Generated/Models/AmazonRdsForOracleSource.cs
+++ b/src/AzureDataFactory.TestingFramework/Generated/Models/AmazonRdsForOracleSource.cs
@@ -30,7 +30,7 @@ public AmazonRdsForOracleSource()
         /// <param name="partitionOption"> The partition mechanism that will be used for AmazonRdsForOracle read in parallel. Type: string (or Expression with resultType string). </param>
         /// <param name="partitionSettings"> The settings that will be leveraged for AmazonRdsForOracle source partitioning. </param>
         /// <param name="additionalColumns"> Specifies the additional columns to be added to source data. Type: array of objects(AdditionalColumns) (or Expression with resultType array of objects). </param>
-        internal AmazonRdsForOracleSource(string copySourceType, DataFactoryElement<int> sourceRetryCount, DataFactoryElement<string> sourceRetryWait, DataFactoryElement<int> maxConcurrentConnections, DataFactoryElement<bool> disableMetricsCollection, IDictionary<string, BinaryData> additionalProperties, DataFactoryElement<string> oracleReaderQuery, DataFactoryElement<string> queryTimeout, DataFactoryElement<string> partitionOption, AmazonRdsForOraclePartitionSettings partitionSettings, BinaryData additionalColumns) : base(copySourceType, sourceRetryCount, sourceRetryWait, maxConcurrentConnections, disableMetricsCollection, additionalProperties)
+        internal AmazonRdsForOracleSource(string copySourceType, DataFactoryElement<int> sourceRetryCount, DataFactoryElement<string> sourceRetryWait, DataFactoryElement<int> maxConcurrentConnections, DataFactoryElement<bool> disableMetricsCollection, IDictionary<string, DataFactoryElement<string>> additionalProperties, DataFactoryElement<string> oracleReaderQuery, DataFactoryElement<string> queryTimeout, DataFactoryElement<string> partitionOption, AmazonRdsForOraclePartitionSettings partitionSettings, BinaryData additionalColumns) : base(copySourceType, sourceRetryCount, sourceRetryWait, maxConcurrentConnections, disableMetricsCollection, additionalProperties)
         {
             OracleReaderQuery = oracleReaderQuery;
             QueryTimeout = queryTimeout;
diff --git a/src/AzureDataFactory.TestingFramework/Generated/Models/AmazonRdsForOracleTableDataset.Serialization.cs b/src/AzureDataFactory.TestingFramework/Generated/Models/AmazonRdsForOracleTableDataset.Serialization.cs
index 3431e670..83dbcf31 100644
--- a/src/AzureDataFactory.TestingFramework/Generated/Models/AmazonRdsForOracleTableDataset.Serialization.cs
+++ b/src/AzureDataFactory.TestingFramework/Generated/Models/AmazonRdsForOracleTableDataset.Serialization.cs
@@ -110,8 +110,8 @@ internal static AmazonRdsForOracleTableDataset DeserializeAmazonRdsForOracleTabl
             Optional<DatasetFolder> folder = default;
             Optional<DataFactoryElement<string>> schema0 = default;
             Optional<DataFactoryElement<string>> table = default;
-            IDictionary<string, BinaryData> additionalProperties = default;
-            Dictionary<string, BinaryData> additionalPropertiesDictionary = new Dictionary<string, BinaryData>();
+            IDictionary<string, DataFactoryElement<string>> additionalProperties = default;
+            Dictionary<string, DataFactoryElement<string>> additionalPropertiesDictionary = new Dictionary<string, DataFactoryElement<string>>();
             foreach (var property in element.EnumerateObject())
             {
                 if (property.NameEquals("type"u8))
@@ -221,7 +221,7 @@ internal static AmazonRdsForOracleTableDataset DeserializeAmazonRdsForOracleTabl
                     }
                     continue;
                 }
-                additionalPropertiesDictionary.Add(property.Name, BinaryData.FromString(property.Value.GetRawText()));
+                additionalPropertiesDictionary.Add(property.Name, JsonSerializer.Deserialize<DataFactoryElement<string>>(property.Value.GetRawText()));
             }
             additionalProperties = additionalPropertiesDictionary;
             return new AmazonRdsForOracleTableDataset(type, description.Value, structure.Value, schema.Value, linkedServiceName, Optional.ToDictionary(parameters), Optional.ToList(annotations), folder.Value, additionalProperties, schema0.Value, table.Value);
diff --git a/src/AzureDataFactory.TestingFramework/Generated/Models/AmazonRdsForOracleTableDataset.cs b/src/AzureDataFactory.TestingFramework/Generated/Models/AmazonRdsForOracleTableDataset.cs
index c69f3766..e3a4a2ca 100644
--- a/src/AzureDataFactory.TestingFramework/Generated/Models/AmazonRdsForOracleTableDataset.cs
+++ b/src/AzureDataFactory.TestingFramework/Generated/Models/AmazonRdsForOracleTableDataset.cs
@@ -35,7 +35,7 @@ public AmazonRdsForOracleTableDataset(DataFactoryLinkedServiceReference linkedSe
         /// <param name="additionalProperties"> Additional Properties. </param>
         /// <param name="schemaTypePropertiesSchema"> The schema name of the AmazonRdsForOracle database. Type: string (or Expression with resultType string). </param>
         /// <param name="table"> The table name of the AmazonRdsForOracle database. Type: string (or Expression with resultType string). </param>
-        internal AmazonRdsForOracleTableDataset(string datasetType, string description, DataFactoryElement<IList<DatasetDataElement>> structure, DataFactoryElement<IList<DatasetSchemaDataElement>> schema, DataFactoryLinkedServiceReference linkedServiceName, IDictionary<string, EntityParameterSpecification> parameters, IList<BinaryData> annotations, DatasetFolder folder, IDictionary<string, BinaryData> additionalProperties, DataFactoryElement<string> schemaTypePropertiesSchema, DataFactoryElement<string> table) : base(datasetType, description, structure, schema, linkedServiceName, parameters, annotations, folder, additionalProperties)
+        internal AmazonRdsForOracleTableDataset(string datasetType, string description, DataFactoryElement<IList<DatasetDataElement>> structure, DataFactoryElement<IList<DatasetSchemaDataElement>> schema, DataFactoryLinkedServiceReference linkedServiceName, IDictionary<string, EntityParameterSpecification> parameters, IList<BinaryData> annotations, DatasetFolder folder, IDictionary<string, DataFactoryElement<string>> additionalProperties, DataFactoryElement<string> schemaTypePropertiesSchema, DataFactoryElement<string> table) : base(datasetType, description, structure, schema, linkedServiceName, parameters, annotations, folder, additionalProperties)
         {
             SchemaTypePropertiesSchema = schemaTypePropertiesSchema;
             Table = table;
diff --git a/src/AzureDataFactory.TestingFramework/Generated/Models/AmazonRdsForSqlServerLinkedService.Serialization.cs b/src/AzureDataFactory.TestingFramework/Generated/Models/AmazonRdsForSqlServerLinkedService.Serialization.cs
index a582abbc..cfcac8d2 100644
--- a/src/AzureDataFactory.TestingFramework/Generated/Models/AmazonRdsForSqlServerLinkedService.Serialization.cs
+++ b/src/AzureDataFactory.TestingFramework/Generated/Models/AmazonRdsForSqlServerLinkedService.Serialization.cs
@@ -111,8 +111,8 @@ internal static AmazonRdsForSqlServerLinkedService DeserializeAmazonRdsForSqlSer
             Optional<DataFactorySecretBaseDefinition> password = default;
             Optional<string> encryptedCredential = default;
             Optional<SqlAlwaysEncryptedProperties> alwaysEncryptedSettings = default;
-            IDictionary<string, BinaryData> additionalProperties = default;
-            Dictionary<string, BinaryData> additionalPropertiesDictionary = new Dictionary<string, BinaryData>();
+            IDictionary<string, DataFactoryElement<string>> additionalProperties = default;
+            Dictionary<string, DataFactoryElement<string>> additionalPropertiesDictionary = new Dictionary<string, DataFactoryElement<string>>();
             foreach (var property in element.EnumerateObject())
             {
                 if (property.NameEquals("type"u8))
@@ -218,7 +218,7 @@ internal static AmazonRdsForSqlServerLinkedService DeserializeAmazonRdsForSqlSer
                     }
                     continue;
                 }
-                additionalPropertiesDictionary.Add(property.Name, BinaryData.FromString(property.Value.GetRawText()));
+                additionalPropertiesDictionary.Add(property.Name, JsonSerializer.Deserialize<DataFactoryElement<string>>(property.Value.GetRawText()));
             }
             additionalProperties = additionalPropertiesDictionary;
             return new AmazonRdsForSqlServerLinkedService(type, connectVia.Value, description.Value, Optional.ToDictionary(parameters), Optional.ToList(annotations), additionalProperties, connectionString, userName.Value, password, encryptedCredential.Value, alwaysEncryptedSettings.Value);
diff --git a/src/AzureDataFactory.TestingFramework/Generated/Models/AmazonRdsForSqlServerLinkedService.cs b/src/AzureDataFactory.TestingFramework/Generated/Models/AmazonRdsForSqlServerLinkedService.cs
index a206ed2d..2da5f11a 100644
--- a/src/AzureDataFactory.TestingFramework/Generated/Models/AmazonRdsForSqlServerLinkedService.cs
+++ b/src/AzureDataFactory.TestingFramework/Generated/Models/AmazonRdsForSqlServerLinkedService.cs
@@ -36,7 +36,7 @@ public AmazonRdsForSqlServerLinkedService(DataFactoryElement<string> connectionS
         /// <param name="password"> The on-premises Windows authentication password. </param>
         /// <param name="encryptedCredential"> The encrypted credential used for authentication. Credentials are encrypted using the integration runtime credential manager. Type: string. </param>
         /// <param name="alwaysEncryptedSettings"> Sql always encrypted properties. </param>
-        internal AmazonRdsForSqlServerLinkedService(string linkedServiceType, IntegrationRuntimeReference connectVia, string description, IDictionary<string, EntityParameterSpecification> parameters, IList<BinaryData> annotations, IDictionary<string, BinaryData> additionalProperties, DataFactoryElement<string> connectionString, DataFactoryElement<string> userName, DataFactorySecretBaseDefinition password, string encryptedCredential, SqlAlwaysEncryptedProperties alwaysEncryptedSettings) : base(linkedServiceType, connectVia, description, parameters, annotations, additionalProperties)
+        internal AmazonRdsForSqlServerLinkedService(string linkedServiceType, IntegrationRuntimeReference connectVia, string description, IDictionary<string, EntityParameterSpecification> parameters, IList<BinaryData> annotations, IDictionary<string, DataFactoryElement<string>> additionalProperties, DataFactoryElement<string> connectionString, DataFactoryElement<string> userName, DataFactorySecretBaseDefinition password, string encryptedCredential, SqlAlwaysEncryptedProperties alwaysEncryptedSettings) : base(linkedServiceType, connectVia, description, parameters, annotations, additionalProperties)
         {
             ConnectionString = connectionString;
             UserName = userName;
diff --git a/src/AzureDataFactory.TestingFramework/Generated/Models/AmazonRdsForSqlServerSource.Serialization.cs b/src/AzureDataFactory.TestingFramework/Generated/Models/AmazonRdsForSqlServerSource.Serialization.cs
index f0d021d5..5b2f67e2 100644
--- a/src/AzureDataFactory.TestingFramework/Generated/Models/AmazonRdsForSqlServerSource.Serialization.cs
+++ b/src/AzureDataFactory.TestingFramework/Generated/Models/AmazonRdsForSqlServerSource.Serialization.cs
@@ -131,8 +131,8 @@ internal static AmazonRdsForSqlServerSource DeserializeAmazonRdsForSqlServerSour
             Optional<DataFactoryElement<string>> sourceRetryWait = default;
             Optional<DataFactoryElement<int>> maxConcurrentConnections = default;
             Optional<DataFactoryElement<bool>> disableMetricsCollection = default;
-            IDictionary<string, BinaryData> additionalProperties = default;
-            Dictionary<string, BinaryData> additionalPropertiesDictionary = new Dictionary<string, BinaryData>();
+            IDictionary<string, DataFactoryElement<string>> additionalProperties = default;
+            Dictionary<string, DataFactoryElement<string>> additionalPropertiesDictionary = new Dictionary<string, DataFactoryElement<string>>();
             foreach (var property in element.EnumerateObject())
             {
                 if (property.NameEquals("sqlReaderQuery"u8))
@@ -257,7 +257,7 @@ internal static AmazonRdsForSqlServerSource DeserializeAmazonRdsForSqlServerSour
                     disableMetricsCollection = JsonSerializer.Deserialize<DataFactoryElement<bool>>(property.Value.GetRawText());
                     continue;
                 }
-                additionalPropertiesDictionary.Add(property.Name, BinaryData.FromString(property.Value.GetRawText()));
+                additionalPropertiesDictionary.Add(property.Name, JsonSerializer.Deserialize<DataFactoryElement<string>>(property.Value.GetRawText()));
             }
             additionalProperties = additionalPropertiesDictionary;
             return new AmazonRdsForSqlServerSource(type, sourceRetryCount.Value, sourceRetryWait.Value, maxConcurrentConnections.Value, disableMetricsCollection.Value, additionalProperties, queryTimeout.Value, additionalColumns.Value, sqlReaderQuery.Value, sqlReaderStoredProcedureName.Value, storedProcedureParameters.Value, isolationLevel.Value, produceAdditionalTypes.Value, partitionOption.Value, partitionSettings.Value);
diff --git a/src/AzureDataFactory.TestingFramework/Generated/Models/AmazonRdsForSqlServerSource.cs b/src/AzureDataFactory.TestingFramework/Generated/Models/AmazonRdsForSqlServerSource.cs
index af54b8d6..093b2617 100644
--- a/src/AzureDataFactory.TestingFramework/Generated/Models/AmazonRdsForSqlServerSource.cs
+++ b/src/AzureDataFactory.TestingFramework/Generated/Models/AmazonRdsForSqlServerSource.cs
@@ -34,7 +34,7 @@ public AmazonRdsForSqlServerSource()
         /// <param name="produceAdditionalTypes"> Which additional types to produce. </param>
         /// <param name="partitionOption"> The partition mechanism that will be used for Sql read in parallel. Possible values include: "None", "PhysicalPartitionsOfTable", "DynamicRange". </param>
         /// <param name="partitionSettings"> The settings that will be leveraged for Sql source partitioning. </param>
-        internal AmazonRdsForSqlServerSource(string copySourceType, DataFactoryElement<int> sourceRetryCount, DataFactoryElement<string> sourceRetryWait, DataFactoryElement<int> maxConcurrentConnections, DataFactoryElement<bool> disableMetricsCollection, IDictionary<string, BinaryData> additionalProperties, DataFactoryElement<string> queryTimeout, BinaryData additionalColumns, DataFactoryElement<string> sqlReaderQuery, DataFactoryElement<string> sqlReaderStoredProcedureName, BinaryData storedProcedureParameters, DataFactoryElement<string> isolationLevel, BinaryData produceAdditionalTypes, BinaryData partitionOption, SqlPartitionSettings partitionSettings) : base(copySourceType, sourceRetryCount, sourceRetryWait, maxConcurrentConnections, disableMetricsCollection, additionalProperties, queryTimeout, additionalColumns)
+        internal AmazonRdsForSqlServerSource(string copySourceType, DataFactoryElement<int> sourceRetryCount, DataFactoryElement<string> sourceRetryWait, DataFactoryElement<int> maxConcurrentConnections, DataFactoryElement<bool> disableMetricsCollection, IDictionary<string, DataFactoryElement<string>> additionalProperties, DataFactoryElement<string> queryTimeout, BinaryData additionalColumns, DataFactoryElement<string> sqlReaderQuery, DataFactoryElement<string> sqlReaderStoredProcedureName, BinaryData storedProcedureParameters, DataFactoryElement<string> isolationLevel, BinaryData produceAdditionalTypes, BinaryData partitionOption, SqlPartitionSettings partitionSettings) : base(copySourceType, sourceRetryCount, sourceRetryWait, maxConcurrentConnections, disableMetricsCollection, additionalProperties, queryTimeout, additionalColumns)
         {
             SqlReaderQuery = sqlReaderQuery;
             SqlReaderStoredProcedureName = sqlReaderStoredProcedureName;
diff --git a/src/AzureDataFactory.TestingFramework/Generated/Models/AmazonRdsForSqlServerTableDataset.Serialization.cs b/src/AzureDataFactory.TestingFramework/Generated/Models/AmazonRdsForSqlServerTableDataset.Serialization.cs
index fdc2a411..2c6303f6 100644
--- a/src/AzureDataFactory.TestingFramework/Generated/Models/AmazonRdsForSqlServerTableDataset.Serialization.cs
+++ b/src/AzureDataFactory.TestingFramework/Generated/Models/AmazonRdsForSqlServerTableDataset.Serialization.cs
@@ -110,8 +110,8 @@ internal static AmazonRdsForSqlServerTableDataset DeserializeAmazonRdsForSqlServ
             Optional<DatasetFolder> folder = default;
             Optional<DataFactoryElement<string>> schema0 = default;
             Optional<DataFactoryElement<string>> table = default;
-            IDictionary<string, BinaryData> additionalProperties = default;
-            Dictionary<string, BinaryData> additionalPropertiesDictionary = new Dictionary<string, BinaryData>();
+            IDictionary<string, DataFactoryElement<string>> additionalProperties = default;
+            Dictionary<string, DataFactoryElement<string>> additionalPropertiesDictionary = new Dictionary<string, DataFactoryElement<string>>();
             foreach (var property in element.EnumerateObject())
             {
                 if (property.NameEquals("type"u8))
@@ -221,7 +221,7 @@ internal static AmazonRdsForSqlServerTableDataset DeserializeAmazonRdsForSqlServ
                     }
                     continue;
                 }
-                additionalPropertiesDictionary.Add(property.Name, BinaryData.FromString(property.Value.GetRawText()));
+                additionalPropertiesDictionary.Add(property.Name, JsonSerializer.Deserialize<DataFactoryElement<string>>(property.Value.GetRawText()));
             }
             additionalProperties = additionalPropertiesDictionary;
             return new AmazonRdsForSqlServerTableDataset(type, description.Value, structure.Value, schema.Value, linkedServiceName, Optional.ToDictionary(parameters), Optional.ToList(annotations), folder.Value, additionalProperties, schema0.Value, table.Value);
diff --git a/src/AzureDataFactory.TestingFramework/Generated/Models/AmazonRdsForSqlServerTableDataset.cs b/src/AzureDataFactory.TestingFramework/Generated/Models/AmazonRdsForSqlServerTableDataset.cs
index 1b50952b..66e7b988 100644
--- a/src/AzureDataFactory.TestingFramework/Generated/Models/AmazonRdsForSqlServerTableDataset.cs
+++ b/src/AzureDataFactory.TestingFramework/Generated/Models/AmazonRdsForSqlServerTableDataset.cs
@@ -35,7 +35,7 @@ public AmazonRdsForSqlServerTableDataset(DataFactoryLinkedServiceReference linke
         /// <param name="additionalProperties"> Additional Properties. </param>
         /// <param name="schemaTypePropertiesSchema"> The schema name of the SQL Server dataset. Type: string (or Expression with resultType string). </param>
         /// <param name="table"> The table name of the SQL Server dataset. Type: string (or Expression with resultType string). </param>
-        internal AmazonRdsForSqlServerTableDataset(string datasetType, string description, DataFactoryElement<IList<DatasetDataElement>> structure, DataFactoryElement<IList<DatasetSchemaDataElement>> schema, DataFactoryLinkedServiceReference linkedServiceName, IDictionary<string, EntityParameterSpecification> parameters, IList<BinaryData> annotations, DatasetFolder folder, IDictionary<string, BinaryData> additionalProperties, DataFactoryElement<string> schemaTypePropertiesSchema, DataFactoryElement<string> table) : base(datasetType, description, structure, schema, linkedServiceName, parameters, annotations, folder, additionalProperties)
+        internal AmazonRdsForSqlServerTableDataset(string datasetType, string description, DataFactoryElement<IList<DatasetDataElement>> structure, DataFactoryElement<IList<DatasetSchemaDataElement>> schema, DataFactoryLinkedServiceReference linkedServiceName, IDictionary<string, EntityParameterSpecification> parameters, IList<BinaryData> annotations, DatasetFolder folder, IDictionary<string, DataFactoryElement<string>> additionalProperties, DataFactoryElement<string> schemaTypePropertiesSchema, DataFactoryElement<string> table) : base(datasetType, description, structure, schema, linkedServiceName, parameters, annotations, folder, additionalProperties)
         {
             SchemaTypePropertiesSchema = schemaTypePropertiesSchema;
             Table = table;
diff --git a/src/AzureDataFactory.TestingFramework/Generated/Models/AmazonRedshiftLinkedService.Serialization.cs b/src/AzureDataFactory.TestingFramework/Generated/Models/AmazonRedshiftLinkedService.Serialization.cs
index 55fd015b..17a98c2b 100644
--- a/src/AzureDataFactory.TestingFramework/Generated/Models/AmazonRedshiftLinkedService.Serialization.cs
+++ b/src/AzureDataFactory.TestingFramework/Generated/Models/AmazonRedshiftLinkedService.Serialization.cs
@@ -114,8 +114,8 @@ internal static AmazonRedshiftLinkedService DeserializeAmazonRedshiftLinkedServi
             DataFactoryElement<string> database = default;
             Optional<DataFactoryElement<int>> port = default;
             Optional<string> encryptedCredential = default;
-            IDictionary<string, BinaryData> additionalProperties = default;
-            Dictionary<string, BinaryData> additionalPropertiesDictionary = new Dictionary<string, BinaryData>();
+            IDictionary<string, DataFactoryElement<string>> additionalProperties = default;
+            Dictionary<string, DataFactoryElement<string>> additionalPropertiesDictionary = new Dictionary<string, DataFactoryElement<string>>();
             foreach (var property in element.EnumerateObject())
             {
                 if (property.NameEquals("type"u8))
@@ -226,7 +226,7 @@ internal static AmazonRedshiftLinkedService DeserializeAmazonRedshiftLinkedServi
                     }
                     continue;
                 }
-                additionalPropertiesDictionary.Add(property.Name, BinaryData.FromString(property.Value.GetRawText()));
+                additionalPropertiesDictionary.Add(property.Name, JsonSerializer.Deserialize<DataFactoryElement<string>>(property.Value.GetRawText()));
             }
             additionalProperties = additionalPropertiesDictionary;
             return new AmazonRedshiftLinkedService(type, connectVia.Value, description.Value, Optional.ToDictionary(parameters), Optional.ToList(annotations), additionalProperties, server, username.Value, password, database, port.Value, encryptedCredential.Value);
diff --git a/src/AzureDataFactory.TestingFramework/Generated/Models/AmazonRedshiftLinkedService.cs b/src/AzureDataFactory.TestingFramework/Generated/Models/AmazonRedshiftLinkedService.cs
index d1e575e0..05ed8b6e 100644
--- a/src/AzureDataFactory.TestingFramework/Generated/Models/AmazonRedshiftLinkedService.cs
+++ b/src/AzureDataFactory.TestingFramework/Generated/Models/AmazonRedshiftLinkedService.cs
@@ -40,7 +40,7 @@ public AmazonRedshiftLinkedService(DataFactoryElement<string> server, DataFactor
         /// <param name="database"> The database name of the Amazon Redshift source. Type: string (or Expression with resultType string). </param>
         /// <param name="port"> The TCP port number that the Amazon Redshift server uses to listen for client connections. The default value is 5439. Type: integer (or Expression with resultType integer). </param>
         /// <param name="encryptedCredential"> The encrypted credential used for authentication. Credentials are encrypted using the integration runtime credential manager. Type: string. </param>
-        internal AmazonRedshiftLinkedService(string linkedServiceType, IntegrationRuntimeReference connectVia, string description, IDictionary<string, EntityParameterSpecification> parameters, IList<BinaryData> annotations, IDictionary<string, BinaryData> additionalProperties, DataFactoryElement<string> server, DataFactoryElement<string> username, DataFactorySecretBaseDefinition password, DataFactoryElement<string> database, DataFactoryElement<int> port, string encryptedCredential) : base(linkedServiceType, connectVia, description, parameters, annotations, additionalProperties)
+        internal AmazonRedshiftLinkedService(string linkedServiceType, IntegrationRuntimeReference connectVia, string description, IDictionary<string, EntityParameterSpecification> parameters, IList<BinaryData> annotations, IDictionary<string, DataFactoryElement<string>> additionalProperties, DataFactoryElement<string> server, DataFactoryElement<string> username, DataFactorySecretBaseDefinition password, DataFactoryElement<string> database, DataFactoryElement<int> port, string encryptedCredential) : base(linkedServiceType, connectVia, description, parameters, annotations, additionalProperties)
         {
             Server = server;
             Username = username;
diff --git a/src/AzureDataFactory.TestingFramework/Generated/Models/AmazonRedshiftSource.Serialization.cs b/src/AzureDataFactory.TestingFramework/Generated/Models/AmazonRedshiftSource.Serialization.cs
index fc779143..a658f1c9 100644
--- a/src/AzureDataFactory.TestingFramework/Generated/Models/AmazonRedshiftSource.Serialization.cs
+++ b/src/AzureDataFactory.TestingFramework/Generated/Models/AmazonRedshiftSource.Serialization.cs
@@ -89,8 +89,8 @@ internal static AmazonRedshiftSource DeserializeAmazonRedshiftSource(JsonElement
             Optional<DataFactoryElement<string>> sourceRetryWait = default;
             Optional<DataFactoryElement<int>> maxConcurrentConnections = default;
             Optional<DataFactoryElement<bool>> disableMetricsCollection = default;
-            IDictionary<string, BinaryData> additionalProperties = default;
-            Dictionary<string, BinaryData> additionalPropertiesDictionary = new Dictionary<string, BinaryData>();
+            IDictionary<string, DataFactoryElement<string>> additionalProperties = default;
+            Dictionary<string, DataFactoryElement<string>> additionalPropertiesDictionary = new Dictionary<string, DataFactoryElement<string>>();
             foreach (var property in element.EnumerateObject())
             {
                 if (property.NameEquals("query"u8))
@@ -170,7 +170,7 @@ internal static AmazonRedshiftSource DeserializeAmazonRedshiftSource(JsonElement
                     disableMetricsCollection = JsonSerializer.Deserialize<DataFactoryElement<bool>>(property.Value.GetRawText());
                     continue;
                 }
-                additionalPropertiesDictionary.Add(property.Name, BinaryData.FromString(property.Value.GetRawText()));
+                additionalPropertiesDictionary.Add(property.Name, JsonSerializer.Deserialize<DataFactoryElement<string>>(property.Value.GetRawText()));
             }
             additionalProperties = additionalPropertiesDictionary;
             return new AmazonRedshiftSource(type, sourceRetryCount.Value, sourceRetryWait.Value, maxConcurrentConnections.Value, disableMetricsCollection.Value, additionalProperties, queryTimeout.Value, additionalColumns.Value, query.Value, redshiftUnloadSettings.Value);
diff --git a/src/AzureDataFactory.TestingFramework/Generated/Models/AmazonRedshiftSource.cs b/src/AzureDataFactory.TestingFramework/Generated/Models/AmazonRedshiftSource.cs
index 19e3a75f..041f1d7c 100644
--- a/src/AzureDataFactory.TestingFramework/Generated/Models/AmazonRedshiftSource.cs
+++ b/src/AzureDataFactory.TestingFramework/Generated/Models/AmazonRedshiftSource.cs
@@ -29,7 +29,7 @@ public AmazonRedshiftSource()
         /// <param name="additionalColumns"> Specifies the additional columns to be added to source data. Type: array of objects(AdditionalColumns) (or Expression with resultType array of objects). </param>
         /// <param name="query"> Database query. Type: string (or Expression with resultType string). </param>
         /// <param name="redshiftUnloadSettings"> The Amazon S3 settings needed for the interim Amazon S3 when copying from Amazon Redshift with unload. With this, data from Amazon Redshift source will be unloaded into S3 first and then copied into the targeted sink from the interim S3. </param>
-        internal AmazonRedshiftSource(string copySourceType, DataFactoryElement<int> sourceRetryCount, DataFactoryElement<string> sourceRetryWait, DataFactoryElement<int> maxConcurrentConnections, DataFactoryElement<bool> disableMetricsCollection, IDictionary<string, BinaryData> additionalProperties, DataFactoryElement<string> queryTimeout, BinaryData additionalColumns, DataFactoryElement<string> query, RedshiftUnloadSettings redshiftUnloadSettings) : base(copySourceType, sourceRetryCount, sourceRetryWait, maxConcurrentConnections, disableMetricsCollection, additionalProperties, queryTimeout, additionalColumns)
+        internal AmazonRedshiftSource(string copySourceType, DataFactoryElement<int> sourceRetryCount, DataFactoryElement<string> sourceRetryWait, DataFactoryElement<int> maxConcurrentConnections, DataFactoryElement<bool> disableMetricsCollection, IDictionary<string, DataFactoryElement<string>> additionalProperties, DataFactoryElement<string> queryTimeout, BinaryData additionalColumns, DataFactoryElement<string> query, RedshiftUnloadSettings redshiftUnloadSettings) : base(copySourceType, sourceRetryCount, sourceRetryWait, maxConcurrentConnections, disableMetricsCollection, additionalProperties, queryTimeout, additionalColumns)
         {
             Query = query;
             RedshiftUnloadSettings = redshiftUnloadSettings;
diff --git a/src/AzureDataFactory.TestingFramework/Generated/Models/AmazonRedshiftTableDataset.Serialization.cs b/src/AzureDataFactory.TestingFramework/Generated/Models/AmazonRedshiftTableDataset.Serialization.cs
index fb496dd7..dfd7becb 100644
--- a/src/AzureDataFactory.TestingFramework/Generated/Models/AmazonRedshiftTableDataset.Serialization.cs
+++ b/src/AzureDataFactory.TestingFramework/Generated/Models/AmazonRedshiftTableDataset.Serialization.cs
@@ -120,8 +120,8 @@ internal static AmazonRedshiftTableDataset DeserializeAmazonRedshiftTableDataset
             Optional<BinaryData> tableName = default;
             Optional<DataFactoryElement<string>> table = default;
             Optional<DataFactoryElement<string>> schema0 = default;
-            IDictionary<string, BinaryData> additionalProperties = default;
-            Dictionary<string, BinaryData> additionalPropertiesDictionary = new Dictionary<string, BinaryData>();
+            IDictionary<string, DataFactoryElement<string>> additionalProperties = default;
+            Dictionary<string, DataFactoryElement<string>> additionalPropertiesDictionary = new Dictionary<string, DataFactoryElement<string>>();
             foreach (var property in element.EnumerateObject())
             {
                 if (property.NameEquals("type"u8))
@@ -240,7 +240,7 @@ internal static AmazonRedshiftTableDataset DeserializeAmazonRedshiftTableDataset
                     }
                     continue;
                 }
-                additionalPropertiesDictionary.Add(property.Name, BinaryData.FromString(property.Value.GetRawText()));
+                additionalPropertiesDictionary.Add(property.Name, JsonSerializer.Deserialize<DataFactoryElement<string>>(property.Value.GetRawText()));
             }
             additionalProperties = additionalPropertiesDictionary;
             return new AmazonRedshiftTableDataset(type, description.Value, structure.Value, schema.Value, linkedServiceName, Optional.ToDictionary(parameters), Optional.ToList(annotations), folder.Value, additionalProperties, tableName.Value, table.Value, schema0.Value);
diff --git a/src/AzureDataFactory.TestingFramework/Generated/Models/AmazonRedshiftTableDataset.cs b/src/AzureDataFactory.TestingFramework/Generated/Models/AmazonRedshiftTableDataset.cs
index d6f8b365..f1b94d8f 100644
--- a/src/AzureDataFactory.TestingFramework/Generated/Models/AmazonRedshiftTableDataset.cs
+++ b/src/AzureDataFactory.TestingFramework/Generated/Models/AmazonRedshiftTableDataset.cs
@@ -36,7 +36,7 @@ public AmazonRedshiftTableDataset(DataFactoryLinkedServiceReference linkedServic
         /// <param name="tableName"> This property will be retired. Please consider using schema + table properties instead. </param>
         /// <param name="table"> The Amazon Redshift table name. Type: string (or Expression with resultType string). </param>
         /// <param name="schemaTypePropertiesSchema"> The Amazon Redshift schema name. Type: string (or Expression with resultType string). </param>
-        internal AmazonRedshiftTableDataset(string datasetType, string description, DataFactoryElement<IList<DatasetDataElement>> structure, DataFactoryElement<IList<DatasetSchemaDataElement>> schema, DataFactoryLinkedServiceReference linkedServiceName, IDictionary<string, EntityParameterSpecification> parameters, IList<BinaryData> annotations, DatasetFolder folder, IDictionary<string, BinaryData> additionalProperties, BinaryData tableName, DataFactoryElement<string> table, DataFactoryElement<string> schemaTypePropertiesSchema) : base(datasetType, description, structure, schema, linkedServiceName, parameters, annotations, folder, additionalProperties)
+        internal AmazonRedshiftTableDataset(string datasetType, string description, DataFactoryElement<IList<DatasetDataElement>> structure, DataFactoryElement<IList<DatasetSchemaDataElement>> schema, DataFactoryLinkedServiceReference linkedServiceName, IDictionary<string, EntityParameterSpecification> parameters, IList<BinaryData> annotations, DatasetFolder folder, IDictionary<string, DataFactoryElement<string>> additionalProperties, BinaryData tableName, DataFactoryElement<string> table, DataFactoryElement<string> schemaTypePropertiesSchema) : base(datasetType, description, structure, schema, linkedServiceName, parameters, annotations, folder, additionalProperties)
         {
             TableName = tableName;
             Table = table;
diff --git a/src/AzureDataFactory.TestingFramework/Generated/Models/AmazonS3CompatibleLinkedService.Serialization.cs b/src/AzureDataFactory.TestingFramework/Generated/Models/AmazonS3CompatibleLinkedService.Serialization.cs
index e5687e89..361001dc 100644
--- a/src/AzureDataFactory.TestingFramework/Generated/Models/AmazonS3CompatibleLinkedService.Serialization.cs
+++ b/src/AzureDataFactory.TestingFramework/Generated/Models/AmazonS3CompatibleLinkedService.Serialization.cs
@@ -114,8 +114,8 @@ internal static AmazonS3CompatibleLinkedService DeserializeAmazonS3CompatibleLin
             Optional<DataFactoryElement<string>> serviceUrl = default;
             Optional<DataFactoryElement<bool>> forcePathStyle = default;
             Optional<string> encryptedCredential = default;
-            IDictionary<string, BinaryData> additionalProperties = default;
-            Dictionary<string, BinaryData> additionalPropertiesDictionary = new Dictionary<string, BinaryData>();
+            IDictionary<string, DataFactoryElement<string>> additionalProperties = default;
+            Dictionary<string, DataFactoryElement<string>> additionalPropertiesDictionary = new Dictionary<string, DataFactoryElement<string>>();
             foreach (var property in element.EnumerateObject())
             {
                 if (property.NameEquals("type"u8))
@@ -225,7 +225,7 @@ internal static AmazonS3CompatibleLinkedService DeserializeAmazonS3CompatibleLin
                     }
                     continue;
                 }
-                additionalPropertiesDictionary.Add(property.Name, BinaryData.FromString(property.Value.GetRawText()));
+                additionalPropertiesDictionary.Add(property.Name, JsonSerializer.Deserialize<DataFactoryElement<string>>(property.Value.GetRawText()));
             }
             additionalProperties = additionalPropertiesDictionary;
             return new AmazonS3CompatibleLinkedService(type, connectVia.Value, description.Value, Optional.ToDictionary(parameters), Optional.ToList(annotations), additionalProperties, accessKeyId.Value, secretAccessKey, serviceUrl.Value, forcePathStyle.Value, encryptedCredential.Value);
diff --git a/src/AzureDataFactory.TestingFramework/Generated/Models/AmazonS3CompatibleLinkedService.cs b/src/AzureDataFactory.TestingFramework/Generated/Models/AmazonS3CompatibleLinkedService.cs
index 463dd320..3bd5400d 100644
--- a/src/AzureDataFactory.TestingFramework/Generated/Models/AmazonS3CompatibleLinkedService.cs
+++ b/src/AzureDataFactory.TestingFramework/Generated/Models/AmazonS3CompatibleLinkedService.cs
@@ -30,7 +30,7 @@ public AmazonS3CompatibleLinkedService()
         /// <param name="serviceUri"> This value specifies the endpoint to access with the Amazon S3 Compatible Connector. This is an optional property; change it only if you want to try a different service endpoint or want to switch between https and http. Type: string (or Expression with resultType string). </param>
         /// <param name="forcePathStyle"> If true, use S3 path-style access instead of virtual hosted-style access. Default value is false. Type: boolean (or Expression with resultType boolean). </param>
         /// <param name="encryptedCredential"> The encrypted credential used for authentication. Credentials are encrypted using the integration runtime credential manager. Type: string. </param>
-        internal AmazonS3CompatibleLinkedService(string linkedServiceType, IntegrationRuntimeReference connectVia, string description, IDictionary<string, EntityParameterSpecification> parameters, IList<BinaryData> annotations, IDictionary<string, BinaryData> additionalProperties, DataFactoryElement<string> accessKeyId, DataFactorySecretBaseDefinition secretAccessKey, DataFactoryElement<string> serviceUri, DataFactoryElement<bool> forcePathStyle, string encryptedCredential) : base(linkedServiceType, connectVia, description, parameters, annotations, additionalProperties)
+        internal AmazonS3CompatibleLinkedService(string linkedServiceType, IntegrationRuntimeReference connectVia, string description, IDictionary<string, EntityParameterSpecification> parameters, IList<BinaryData> annotations, IDictionary<string, DataFactoryElement<string>> additionalProperties, DataFactoryElement<string> accessKeyId, DataFactorySecretBaseDefinition secretAccessKey, DataFactoryElement<string> serviceUri, DataFactoryElement<bool> forcePathStyle, string encryptedCredential) : base(linkedServiceType, connectVia, description, parameters, annotations, additionalProperties)
         {
             AccessKeyId = accessKeyId;
             SecretAccessKey = secretAccessKey;
diff --git a/src/AzureDataFactory.TestingFramework/Generated/Models/AmazonS3CompatibleLocation.Serialization.cs b/src/AzureDataFactory.TestingFramework/Generated/Models/AmazonS3CompatibleLocation.Serialization.cs
index 32c304fb..5fee3e68 100644
--- a/src/AzureDataFactory.TestingFramework/Generated/Models/AmazonS3CompatibleLocation.Serialization.cs
+++ b/src/AzureDataFactory.TestingFramework/Generated/Models/AmazonS3CompatibleLocation.Serialization.cs
@@ -61,8 +61,8 @@ internal static AmazonS3CompatibleLocation DeserializeAmazonS3CompatibleLocation
             string type = default;
             Optional<DataFactoryElement<string>> folderPath = default;
             Optional<DataFactoryElement<string>> fileName = default;
-            IDictionary<string, BinaryData> additionalProperties = default;
-            Dictionary<string, BinaryData> additionalPropertiesDictionary = new Dictionary<string, BinaryData>();
+            IDictionary<string, DataFactoryElement<string>> additionalProperties = default;
+            Dictionary<string, DataFactoryElement<string>> additionalPropertiesDictionary = new Dictionary<string, DataFactoryElement<string>>();
             foreach (var property in element.EnumerateObject())
             {
                 if (property.NameEquals("bucketName"u8))
@@ -106,7 +106,7 @@ internal static AmazonS3CompatibleLocation DeserializeAmazonS3CompatibleLocation
                     fileName = JsonSerializer.Deserialize<DataFactoryElement<string>>(property.Value.GetRawText());
                     continue;
                 }
-                additionalPropertiesDictionary.Add(property.Name, BinaryData.FromString(property.Value.GetRawText()));
+                additionalPropertiesDictionary.Add(property.Name, JsonSerializer.Deserialize<DataFactoryElement<string>>(property.Value.GetRawText()));
             }
             additionalProperties = additionalPropertiesDictionary;
             return new AmazonS3CompatibleLocation(type, folderPath.Value, fileName.Value, additionalProperties, bucketName.Value, version.Value);
diff --git a/src/AzureDataFactory.TestingFramework/Generated/Models/AmazonS3CompatibleLocation.cs b/src/AzureDataFactory.TestingFramework/Generated/Models/AmazonS3CompatibleLocation.cs
index 4268d5c9..29c0362f 100644
--- a/src/AzureDataFactory.TestingFramework/Generated/Models/AmazonS3CompatibleLocation.cs
+++ b/src/AzureDataFactory.TestingFramework/Generated/Models/AmazonS3CompatibleLocation.cs
@@ -25,7 +25,7 @@ public AmazonS3CompatibleLocation()
         /// <param name="additionalProperties"> Additional Properties. </param>
         /// <param name="bucketName"> Specify the bucketName of Amazon S3 Compatible. Type: string (or Expression with resultType string). </param>
         /// <param name="version"> Specify the version of Amazon S3 Compatible. Type: string (or Expression with resultType string). </param>
-        internal AmazonS3CompatibleLocation(string datasetLocationType, DataFactoryElement<string> folderPath, DataFactoryElement<string> fileName, IDictionary<string, BinaryData> additionalProperties, DataFactoryElement<string> bucketName, DataFactoryElement<string> version) : base(datasetLocationType, folderPath, fileName, additionalProperties)
+        internal AmazonS3CompatibleLocation(string datasetLocationType, DataFactoryElement<string> folderPath, DataFactoryElement<string> fileName, IDictionary<string, DataFactoryElement<string>> additionalProperties, DataFactoryElement<string> bucketName, DataFactoryElement<string> version) : base(datasetLocationType, folderPath, fileName, additionalProperties)
         {
             BucketName = bucketName;
             Version = version;
diff --git a/src/AzureDataFactory.TestingFramework/Generated/Models/AmazonS3CompatibleReadSettings.Serialization.cs b/src/AzureDataFactory.TestingFramework/Generated/Models/AmazonS3CompatibleReadSettings.Serialization.cs
index af61dbd2..426d22e3 100644
--- a/src/AzureDataFactory.TestingFramework/Generated/Models/AmazonS3CompatibleReadSettings.Serialization.cs
+++ b/src/AzureDataFactory.TestingFramework/Generated/Models/AmazonS3CompatibleReadSettings.Serialization.cs
@@ -109,8 +109,8 @@ internal static AmazonS3CompatibleReadSettings DeserializeAmazonS3CompatibleRead
             string type = default;
             Optional<DataFactoryElement<int>> maxConcurrentConnections = default;
             Optional<DataFactoryElement<bool>> disableMetricsCollection = default;
-            IDictionary<string, BinaryData> additionalProperties = default;
-            Dictionary<string, BinaryData> additionalPropertiesDictionary = new Dictionary<string, BinaryData>();
+            IDictionary<string, DataFactoryElement<string>> additionalProperties = default;
+            Dictionary<string, DataFactoryElement<string>> additionalPropertiesDictionary = new Dictionary<string, DataFactoryElement<string>>();
             foreach (var property in element.EnumerateObject())
             {
                 if (property.NameEquals("recursive"u8))
@@ -226,7 +226,7 @@ internal static AmazonS3CompatibleReadSettings DeserializeAmazonS3CompatibleRead
                     disableMetricsCollection = JsonSerializer.Deserialize<DataFactoryElement<bool>>(property.Value.GetRawText());
                     continue;
                 }
-                additionalPropertiesDictionary.Add(property.Name, BinaryData.FromString(property.Value.GetRawText()));
+                additionalPropertiesDictionary.Add(property.Name, JsonSerializer.Deserialize<DataFactoryElement<string>>(property.Value.GetRawText()));
             }
             additionalProperties = additionalPropertiesDictionary;
             return new AmazonS3CompatibleReadSettings(type, maxConcurrentConnections.Value, disableMetricsCollection.Value, additionalProperties, recursive.Value, wildcardFolderPath.Value, wildcardFileName.Value, prefix.Value, fileListPath.Value, enablePartitionDiscovery.Value, partitionRootPath.Value, deleteFilesAfterCompletion.Value, modifiedDatetimeStart.Value, modifiedDatetimeEnd.Value);
diff --git a/src/AzureDataFactory.TestingFramework/Generated/Models/AmazonS3CompatibleReadSettings.cs b/src/AzureDataFactory.TestingFramework/Generated/Models/AmazonS3CompatibleReadSettings.cs
index 465c0e27..fbe6c0b8 100644
--- a/src/AzureDataFactory.TestingFramework/Generated/Models/AmazonS3CompatibleReadSettings.cs
+++ b/src/AzureDataFactory.TestingFramework/Generated/Models/AmazonS3CompatibleReadSettings.cs
@@ -33,7 +33,7 @@ public AmazonS3CompatibleReadSettings()
         /// <param name="deleteFilesAfterCompletion"> Indicates whether the source files need to be deleted after copy completion. Default is false. Type: boolean (or Expression with resultType boolean). </param>
         /// <param name="modifiedDatetimeStart"> The start of file's modified datetime. Type: string (or Expression with resultType string). </param>
         /// <param name="modifiedDatetimeEnd"> The end of file's modified datetime. Type: string (or Expression with resultType string). </param>
-        internal AmazonS3CompatibleReadSettings(string storeReadSettingsType, DataFactoryElement<int> maxConcurrentConnections, DataFactoryElement<bool> disableMetricsCollection, IDictionary<string, BinaryData> additionalProperties, DataFactoryElement<bool> recursive, DataFactoryElement<string> wildcardFolderPath, DataFactoryElement<string> wildcardFileName, DataFactoryElement<string> prefix, DataFactoryElement<string> fileListPath, DataFactoryElement<bool> enablePartitionDiscovery, DataFactoryElement<string> partitionRootPath, DataFactoryElement<bool> deleteFilesAfterCompletion, DataFactoryElement<string> modifiedDatetimeStart, DataFactoryElement<string> modifiedDatetimeEnd) : base(storeReadSettingsType, maxConcurrentConnections, disableMetricsCollection, additionalProperties)
+        internal AmazonS3CompatibleReadSettings(string storeReadSettingsType, DataFactoryElement<int> maxConcurrentConnections, DataFactoryElement<bool> disableMetricsCollection, IDictionary<string, DataFactoryElement<string>> additionalProperties, DataFactoryElement<bool> recursive, DataFactoryElement<string> wildcardFolderPath, DataFactoryElement<string> wildcardFileName, DataFactoryElement<string> prefix, DataFactoryElement<string> fileListPath, DataFactoryElement<bool> enablePartitionDiscovery, DataFactoryElement<string> partitionRootPath, DataFactoryElement<bool> deleteFilesAfterCompletion, DataFactoryElement<string> modifiedDatetimeStart, DataFactoryElement<string> modifiedDatetimeEnd) : base(storeReadSettingsType, maxConcurrentConnections, disableMetricsCollection, additionalProperties)
         {
             Recursive = recursive;
             WildcardFolderPath = wildcardFolderPath;
diff --git a/src/AzureDataFactory.TestingFramework/Generated/Models/AmazonS3Dataset.Serialization.cs b/src/AzureDataFactory.TestingFramework/Generated/Models/AmazonS3Dataset.Serialization.cs
index a578d105..7b64cf07 100644
--- a/src/AzureDataFactory.TestingFramework/Generated/Models/AmazonS3Dataset.Serialization.cs
+++ b/src/AzureDataFactory.TestingFramework/Generated/Models/AmazonS3Dataset.Serialization.cs
@@ -143,8 +143,8 @@ internal static AmazonS3Dataset DeserializeAmazonS3Dataset(JsonElement element)
             Optional<DataFactoryElement<string>> modifiedDatetimeEnd = default;
             Optional<DatasetStorageFormat> format = default;
             Optional<DatasetCompression> compression = default;
-            IDictionary<string, BinaryData> additionalProperties = default;
-            Dictionary<string, BinaryData> additionalPropertiesDictionary = new Dictionary<string, BinaryData>();
+            IDictionary<string, DataFactoryElement<string>> additionalProperties = default;
+            Dictionary<string, DataFactoryElement<string>> additionalPropertiesDictionary = new Dictionary<string, DataFactoryElement<string>>();
             foreach (var property in element.EnumerateObject())
             {
                 if (property.NameEquals("type"u8))
@@ -304,7 +304,7 @@ internal static AmazonS3Dataset DeserializeAmazonS3Dataset(JsonElement element)
                     }
                     continue;
                 }
-                additionalPropertiesDictionary.Add(property.Name, BinaryData.FromString(property.Value.GetRawText()));
+                additionalPropertiesDictionary.Add(property.Name, JsonSerializer.Deserialize<DataFactoryElement<string>>(property.Value.GetRawText()));
             }
             additionalProperties = additionalPropertiesDictionary;
             return new AmazonS3Dataset(type, description.Value, structure.Value, schema.Value, linkedServiceName, Optional.ToDictionary(parameters), Optional.ToList(annotations), folder.Value, additionalProperties, bucketName, key.Value, prefix.Value, version.Value, modifiedDatetimeStart.Value, modifiedDatetimeEnd.Value, format.Value, compression.Value);
diff --git a/src/AzureDataFactory.TestingFramework/Generated/Models/AmazonS3Dataset.cs b/src/AzureDataFactory.TestingFramework/Generated/Models/AmazonS3Dataset.cs
index e8a1f84e..78b44f12 100644
--- a/src/AzureDataFactory.TestingFramework/Generated/Models/AmazonS3Dataset.cs
+++ b/src/AzureDataFactory.TestingFramework/Generated/Models/AmazonS3Dataset.cs
@@ -48,7 +48,7 @@ public AmazonS3Dataset(DataFactoryLinkedServiceReference linkedServiceName, Data
         /// The available derived classes include <see cref="DatasetAvroFormat"/>, <see cref="DatasetJsonFormat"/>, <see cref="DatasetOrcFormat"/>, <see cref="DatasetParquetFormat"/> and <see cref="DatasetTextFormat"/>.
         /// </param>
         /// <param name="compression"> The data compression method used for the Amazon S3 object. </param>
-        internal AmazonS3Dataset(string datasetType, string description, DataFactoryElement<IList<DatasetDataElement>> structure, DataFactoryElement<IList<DatasetSchemaDataElement>> schema, DataFactoryLinkedServiceReference linkedServiceName, IDictionary<string, EntityParameterSpecification> parameters, IList<BinaryData> annotations, DatasetFolder folder, IDictionary<string, BinaryData> additionalProperties, DataFactoryElement<string> bucketName, DataFactoryElement<string> key, DataFactoryElement<string> prefix, DataFactoryElement<string> version, DataFactoryElement<string> modifiedDatetimeStart, DataFactoryElement<string> modifiedDatetimeEnd, DatasetStorageFormat format, DatasetCompression compression) : base(datasetType, description, structure, schema, linkedServiceName, parameters, annotations, folder, additionalProperties)
+        internal AmazonS3Dataset(string datasetType, string description, DataFactoryElement<IList<DatasetDataElement>> structure, DataFactoryElement<IList<DatasetSchemaDataElement>> schema, DataFactoryLinkedServiceReference linkedServiceName, IDictionary<string, EntityParameterSpecification> parameters, IList<BinaryData> annotations, DatasetFolder folder, IDictionary<string, DataFactoryElement<string>> additionalProperties, DataFactoryElement<string> bucketName, DataFactoryElement<string> key, DataFactoryElement<string> prefix, DataFactoryElement<string> version, DataFactoryElement<string> modifiedDatetimeStart, DataFactoryElement<string> modifiedDatetimeEnd, DatasetStorageFormat format, DatasetCompression compression) : base(datasetType, description, structure, schema, linkedServiceName, parameters, annotations, folder, additionalProperties)
         {
             BucketName = bucketName;
             Key = key;
diff --git a/src/AzureDataFactory.TestingFramework/Generated/Models/AmazonS3LinkedService.Serialization.cs b/src/AzureDataFactory.TestingFramework/Generated/Models/AmazonS3LinkedService.Serialization.cs
index eb2b602f..a94ed02e 100644
--- a/src/AzureDataFactory.TestingFramework/Generated/Models/AmazonS3LinkedService.Serialization.cs
+++ b/src/AzureDataFactory.TestingFramework/Generated/Models/AmazonS3LinkedService.Serialization.cs
@@ -120,8 +120,8 @@ internal static AmazonS3LinkedService DeserializeAmazonS3LinkedService(JsonEleme
             Optional<DataFactoryElement<string>> serviceUrl = default;
             Optional<DataFactorySecretBaseDefinition> sessionToken = default;
             Optional<string> encryptedCredential = default;
-            IDictionary<string, BinaryData> additionalProperties = default;
-            Dictionary<string, BinaryData> additionalPropertiesDictionary = new Dictionary<string, BinaryData>();
+            IDictionary<string, DataFactoryElement<string>> additionalProperties = default;
+            Dictionary<string, DataFactoryElement<string>> additionalPropertiesDictionary = new Dictionary<string, DataFactoryElement<string>>();
             foreach (var property in element.EnumerateObject())
             {
                 if (property.NameEquals("type"u8))
@@ -240,7 +240,7 @@ internal static AmazonS3LinkedService DeserializeAmazonS3LinkedService(JsonEleme
                     }
                     continue;
                 }
-                additionalPropertiesDictionary.Add(property.Name, BinaryData.FromString(property.Value.GetRawText()));
+                additionalPropertiesDictionary.Add(property.Name, JsonSerializer.Deserialize<DataFactoryElement<string>>(property.Value.GetRawText()));
             }
             additionalProperties = additionalPropertiesDictionary;
             return new AmazonS3LinkedService(type, connectVia.Value, description.Value, Optional.ToDictionary(parameters), Optional.ToList(annotations), additionalProperties, authenticationType.Value, accessKeyId.Value, secretAccessKey, serviceUrl.Value, sessionToken, encryptedCredential.Value);
diff --git a/src/AzureDataFactory.TestingFramework/Generated/Models/AmazonS3LinkedService.cs b/src/AzureDataFactory.TestingFramework/Generated/Models/AmazonS3LinkedService.cs
index 13dd3fff..e9d13e58 100644
--- a/src/AzureDataFactory.TestingFramework/Generated/Models/AmazonS3LinkedService.cs
+++ b/src/AzureDataFactory.TestingFramework/Generated/Models/AmazonS3LinkedService.cs
@@ -31,7 +31,7 @@ public AmazonS3LinkedService()
         /// <param name="serviceUri"> This value specifies the endpoint to access with the S3 Connector. This is an optional property; change it only if you want to try a different service endpoint or want to switch between https and http. Type: string (or Expression with resultType string). </param>
         /// <param name="sessionToken"> The session token for the S3 temporary security credential. </param>
         /// <param name="encryptedCredential"> The encrypted credential used for authentication. Credentials are encrypted using the integration runtime credential manager. Type: string. </param>
-        internal AmazonS3LinkedService(string linkedServiceType, IntegrationRuntimeReference connectVia, string description, IDictionary<string, EntityParameterSpecification> parameters, IList<BinaryData> annotations, IDictionary<string, BinaryData> additionalProperties, DataFactoryElement<string> authenticationType, DataFactoryElement<string> accessKeyId, DataFactorySecretBaseDefinition secretAccessKey, DataFactoryElement<string> serviceUri, DataFactorySecretBaseDefinition sessionToken, string encryptedCredential) : base(linkedServiceType, connectVia, description, parameters, annotations, additionalProperties)
+        internal AmazonS3LinkedService(string linkedServiceType, IntegrationRuntimeReference connectVia, string description, IDictionary<string, EntityParameterSpecification> parameters, IList<BinaryData> annotations, IDictionary<string, DataFactoryElement<string>> additionalProperties, DataFactoryElement<string> authenticationType, DataFactoryElement<string> accessKeyId, DataFactorySecretBaseDefinition secretAccessKey, DataFactoryElement<string> serviceUri, DataFactorySecretBaseDefinition sessionToken, string encryptedCredential) : base(linkedServiceType, connectVia, description, parameters, annotations, additionalProperties)
         {
             AuthenticationType = authenticationType;
             AccessKeyId = accessKeyId;
diff --git a/src/AzureDataFactory.TestingFramework/Generated/Models/AmazonS3Location.Serialization.cs b/src/AzureDataFactory.TestingFramework/Generated/Models/AmazonS3Location.Serialization.cs
index faf7bcee..df4ae6e3 100644
--- a/src/AzureDataFactory.TestingFramework/Generated/Models/AmazonS3Location.Serialization.cs
+++ b/src/AzureDataFactory.TestingFramework/Generated/Models/AmazonS3Location.Serialization.cs
@@ -61,8 +61,8 @@ internal static AmazonS3Location DeserializeAmazonS3Location(JsonElement element
             string type = default;
             Optional<DataFactoryElement<string>> folderPath = default;
             Optional<DataFactoryElement<string>> fileName = default;
-            IDictionary<string, BinaryData> additionalProperties = default;
-            Dictionary<string, BinaryData> additionalPropertiesDictionary = new Dictionary<string, BinaryData>();
+            IDictionary<string, DataFactoryElement<string>> additionalProperties = default;
+            Dictionary<string, DataFactoryElement<string>> additionalPropertiesDictionary = new Dictionary<string, DataFactoryElement<string>>();
             foreach (var property in element.EnumerateObject())
             {
                 if (property.NameEquals("bucketName"u8))
@@ -106,7 +106,7 @@ internal static AmazonS3Location DeserializeAmazonS3Location(JsonElement element
                     fileName = JsonSerializer.Deserialize<DataFactoryElement<string>>(property.Value.GetRawText());
                     continue;
                 }
-                additionalPropertiesDictionary.Add(property.Name, BinaryData.FromString(property.Value.GetRawText()));
+                additionalPropertiesDictionary.Add(property.Name, JsonSerializer.Deserialize<DataFactoryElement<string>>(property.Value.GetRawText()));
             }
             additionalProperties = additionalPropertiesDictionary;
             return new AmazonS3Location(type, folderPath.Value, fileName.Value, additionalProperties, bucketName.Value, version.Value);
diff --git a/src/AzureDataFactory.TestingFramework/Generated/Models/AmazonS3Location.cs b/src/AzureDataFactory.TestingFramework/Generated/Models/AmazonS3Location.cs
index 4b985d9a..16e822a8 100644
--- a/src/AzureDataFactory.TestingFramework/Generated/Models/AmazonS3Location.cs
+++ b/src/AzureDataFactory.TestingFramework/Generated/Models/AmazonS3Location.cs
@@ -25,7 +25,7 @@ public AmazonS3Location()
         /// <param name="additionalProperties"> Additional Properties. </param>
         /// <param name="bucketName"> Specify the bucketName of amazon S3. Type: string (or Expression with resultType string). </param>
         /// <param name="version"> Specify the version of amazon S3. Type: string (or Expression with resultType string). </param>
-        internal AmazonS3Location(string datasetLocationType, DataFactoryElement<string> folderPath, DataFactoryElement<string> fileName, IDictionary<string, BinaryData> additionalProperties, DataFactoryElement<string> bucketName, DataFactoryElement<string> version) : base(datasetLocationType, folderPath, fileName, additionalProperties)
+        internal AmazonS3Location(string datasetLocationType, DataFactoryElement<string> folderPath, DataFactoryElement<string> fileName, IDictionary<string, DataFactoryElement<string>> additionalProperties, DataFactoryElement<string> bucketName, DataFactoryElement<string> version) : base(datasetLocationType, folderPath, fileName, additionalProperties)
         {
             BucketName = bucketName;
             Version = version;
diff --git a/src/AzureDataFactory.TestingFramework/Generated/Models/AmazonS3ReadSettings.Serialization.cs b/src/AzureDataFactory.TestingFramework/Generated/Models/AmazonS3ReadSettings.Serialization.cs
index e77a26eb..7b2ca96c 100644
--- a/src/AzureDataFactory.TestingFramework/Generated/Models/AmazonS3ReadSettings.Serialization.cs
+++ b/src/AzureDataFactory.TestingFramework/Generated/Models/AmazonS3ReadSettings.Serialization.cs
@@ -109,8 +109,8 @@ internal static AmazonS3ReadSettings DeserializeAmazonS3ReadSettings(JsonElement
             string type = default;
             Optional<DataFactoryElement<int>> maxConcurrentConnections = default;
             Optional<DataFactoryElement<bool>> disableMetricsCollection = default;
-            IDictionary<string, BinaryData> additionalProperties = default;
-            Dictionary<string, BinaryData> additionalPropertiesDictionary = new Dictionary<string, BinaryData>();
+            IDictionary<string, DataFactoryElement<string>> additionalProperties = default;
+            Dictionary<string, DataFactoryElement<string>> additionalPropertiesDictionary = new Dictionary<string, DataFactoryElement<string>>();
             foreach (var property in element.EnumerateObject())
             {
                 if (property.NameEquals("recursive"u8))
@@ -226,7 +226,7 @@ internal static AmazonS3ReadSettings DeserializeAmazonS3ReadSettings(JsonElement
                     disableMetricsCollection = JsonSerializer.Deserialize<DataFactoryElement<bool>>(property.Value.GetRawText());
                     continue;
                 }
-                additionalPropertiesDictionary.Add(property.Name, BinaryData.FromString(property.Value.GetRawText()));
+                additionalPropertiesDictionary.Add(property.Name, JsonSerializer.Deserialize<DataFactoryElement<string>>(property.Value.GetRawText()));
             }
             additionalProperties = additionalPropertiesDictionary;
             return new AmazonS3ReadSettings(type, maxConcurrentConnections.Value, disableMetricsCollection.Value, additionalProperties, recursive.Value, wildcardFolderPath.Value, wildcardFileName.Value, prefix.Value, fileListPath.Value, enablePartitionDiscovery.Value, partitionRootPath.Value, deleteFilesAfterCompletion.Value, modifiedDatetimeStart.Value, modifiedDatetimeEnd.Value);
diff --git a/src/AzureDataFactory.TestingFramework/Generated/Models/AmazonS3ReadSettings.cs b/src/AzureDataFactory.TestingFramework/Generated/Models/AmazonS3ReadSettings.cs
index b2bee0fd..e633c9f2 100644
--- a/src/AzureDataFactory.TestingFramework/Generated/Models/AmazonS3ReadSettings.cs
+++ b/src/AzureDataFactory.TestingFramework/Generated/Models/AmazonS3ReadSettings.cs
@@ -33,7 +33,7 @@ public AmazonS3ReadSettings()
         /// <param name="deleteFilesAfterCompletion"> Indicates whether the source files need to be deleted after copy completion. Default is false. Type: boolean (or Expression with resultType boolean). </param>
         /// <param name="modifiedDatetimeStart"> The start of file's modified datetime. Type: string (or Expression with resultType string). </param>
         /// <param name="modifiedDatetimeEnd"> The end of file's modified datetime. Type: string (or Expression with resultType string). </param>
-        internal AmazonS3ReadSettings(string storeReadSettingsType, DataFactoryElement<int> maxConcurrentConnections, DataFactoryElement<bool> disableMetricsCollection, IDictionary<string, BinaryData> additionalProperties, DataFactoryElement<bool> recursive, DataFactoryElement<string> wildcardFolderPath, DataFactoryElement<string> wildcardFileName, DataFactoryElement<string> prefix, DataFactoryElement<string> fileListPath, DataFactoryElement<bool> enablePartitionDiscovery, DataFactoryElement<string> partitionRootPath, DataFactoryElement<bool> deleteFilesAfterCompletion, DataFactoryElement<string> modifiedDatetimeStart, DataFactoryElement<string> modifiedDatetimeEnd) : base(storeReadSettingsType, maxConcurrentConnections, disableMetricsCollection, additionalProperties)
+        internal AmazonS3ReadSettings(string storeReadSettingsType, DataFactoryElement<int> maxConcurrentConnections, DataFactoryElement<bool> disableMetricsCollection, IDictionary<string, DataFactoryElement<string>> additionalProperties, DataFactoryElement<bool> recursive, DataFactoryElement<string> wildcardFolderPath, DataFactoryElement<string> wildcardFileName, DataFactoryElement<string> prefix, DataFactoryElement<string> fileListPath, DataFactoryElement<bool> enablePartitionDiscovery, DataFactoryElement<string> partitionRootPath, DataFactoryElement<bool> deleteFilesAfterCompletion, DataFactoryElement<string> modifiedDatetimeStart, DataFactoryElement<string> modifiedDatetimeEnd) : base(storeReadSettingsType, maxConcurrentConnections, disableMetricsCollection, additionalProperties)
         {
             Recursive = recursive;
             WildcardFolderPath = wildcardFolderPath;
diff --git a/src/AzureDataFactory.TestingFramework/Generated/Models/AppFiguresLinkedService.Serialization.cs b/src/AzureDataFactory.TestingFramework/Generated/Models/AppFiguresLinkedService.Serialization.cs
index d9fc397f..62d041f6 100644
--- a/src/AzureDataFactory.TestingFramework/Generated/Models/AppFiguresLinkedService.Serialization.cs
+++ b/src/AzureDataFactory.TestingFramework/Generated/Models/AppFiguresLinkedService.Serialization.cs
@@ -91,8 +91,8 @@ internal static AppFiguresLinkedService DeserializeAppFiguresLinkedService(JsonE
             DataFactoryElement<string> userName = default;
             DataFactorySecretBaseDefinition password = default;
             DataFactorySecretBaseDefinition clientKey = default;
-            IDictionary<string, BinaryData> additionalProperties = default;
-            Dictionary<string, BinaryData> additionalPropertiesDictionary = new Dictionary<string, BinaryData>();
+            IDictionary<string, DataFactoryElement<string>> additionalProperties = default;
+            Dictionary<string, DataFactoryElement<string>> additionalPropertiesDictionary = new Dictionary<string, DataFactoryElement<string>>();
             foreach (var property in element.EnumerateObject())
             {
                 if (property.NameEquals("type"u8))
@@ -176,7 +176,7 @@ internal static AppFiguresLinkedService DeserializeAppFiguresLinkedService(JsonE
                     }
                     continue;
                 }
-                additionalPropertiesDictionary.Add(property.Name, BinaryData.FromString(property.Value.GetRawText()));
+                additionalPropertiesDictionary.Add(property.Name, JsonSerializer.Deserialize<DataFactoryElement<string>>(property.Value.GetRawText()));
             }
             additionalProperties = additionalPropertiesDictionary;
             return new AppFiguresLinkedService(type, connectVia.Value, description.Value, Optional.ToDictionary(parameters), Optional.ToList(annotations), additionalProperties, userName, password, clientKey);
diff --git a/src/AzureDataFactory.TestingFramework/Generated/Models/AppFiguresLinkedService.cs b/src/AzureDataFactory.TestingFramework/Generated/Models/AppFiguresLinkedService.cs
index 4c2cc933..ad1de613 100644
--- a/src/AzureDataFactory.TestingFramework/Generated/Models/AppFiguresLinkedService.cs
+++ b/src/AzureDataFactory.TestingFramework/Generated/Models/AppFiguresLinkedService.cs
@@ -40,7 +40,7 @@ public AppFiguresLinkedService(DataFactoryElement<string> userName, DataFactoryS
         /// <param name="userName"> The username of the Appfigures source. Type: string (or Expression with resultType string). </param>
         /// <param name="password"> The password of the AppFigures source. </param>
         /// <param name="clientKey"> The client key for the AppFigures source. </param>
-        internal AppFiguresLinkedService(string linkedServiceType, IntegrationRuntimeReference connectVia, string description, IDictionary<string, EntityParameterSpecification> parameters, IList<BinaryData> annotations, IDictionary<string, BinaryData> additionalProperties, DataFactoryElement<string> userName, DataFactorySecretBaseDefinition password, DataFactorySecretBaseDefinition clientKey) : base(linkedServiceType, connectVia, description, parameters, annotations, additionalProperties)
+        internal AppFiguresLinkedService(string linkedServiceType, IntegrationRuntimeReference connectVia, string description, IDictionary<string, EntityParameterSpecification> parameters, IList<BinaryData> annotations, IDictionary<string, DataFactoryElement<string>> additionalProperties, DataFactoryElement<string> userName, DataFactorySecretBaseDefinition password, DataFactorySecretBaseDefinition clientKey) : base(linkedServiceType, connectVia, description, parameters, annotations, additionalProperties)
         {
             UserName = userName;
             Password = password;
diff --git a/src/AzureDataFactory.TestingFramework/Generated/Models/AppendVariableActivity.Serialization.cs b/src/AzureDataFactory.TestingFramework/Generated/Models/AppendVariableActivity.Serialization.cs
index 571b0930..4559e93e 100644
--- a/src/AzureDataFactory.TestingFramework/Generated/Models/AppendVariableActivity.Serialization.cs
+++ b/src/AzureDataFactory.TestingFramework/Generated/Models/AppendVariableActivity.Serialization.cs
@@ -95,8 +95,8 @@ internal static AppendVariableActivity DeserializeAppendVariableActivity(JsonEle
             Optional<IList<PipelineActivityUserProperty>> userProperties = default;
             Optional<string> variableName = default;
             Optional<DataFactoryElement<BinaryData>> value = default;
-            IDictionary<string, BinaryData> additionalProperties = default;
-            Dictionary<string, BinaryData> additionalPropertiesDictionary = new Dictionary<string, BinaryData>();
+            IDictionary<string, DataFactoryElement<string>> additionalProperties = default;
+            Dictionary<string, DataFactoryElement<string>> additionalPropertiesDictionary = new Dictionary<string, DataFactoryElement<string>>();
             foreach (var property in element.EnumerateObject())
             {
                 if (property.NameEquals("name"u8))
@@ -186,7 +186,7 @@ internal static AppendVariableActivity DeserializeAppendVariableActivity(JsonEle
                     }
                     continue;
                 }
-                additionalPropertiesDictionary.Add(property.Name, BinaryData.FromString(property.Value.GetRawText()));
+                additionalPropertiesDictionary.Add(property.Name, JsonSerializer.Deserialize<DataFactoryElement<string>>(property.Value.GetRawText()));
             }
             additionalProperties = additionalPropertiesDictionary;
             return new AppendVariableActivity(name, type, description.Value, Optional.ToNullable(state), Optional.ToNullable(onInactiveMarkAs), Optional.ToList(dependsOn), Optional.ToList(userProperties), additionalProperties, variableName.Value, value.Value);
diff --git a/src/AzureDataFactory.TestingFramework/Generated/Models/AppendVariableActivity.cs b/src/AzureDataFactory.TestingFramework/Generated/Models/AppendVariableActivity.cs
index 537f884b..b7ae45f6 100644
--- a/src/AzureDataFactory.TestingFramework/Generated/Models/AppendVariableActivity.cs
+++ b/src/AzureDataFactory.TestingFramework/Generated/Models/AppendVariableActivity.cs
@@ -34,7 +34,7 @@ public AppendVariableActivity(string name) : base(name)
         /// <param name="additionalProperties"> Additional Properties. </param>
         /// <param name="variableName"> Name of the variable whose value needs to be appended to. </param>
         /// <param name="value"> Value to be appended. Type: could be a static value matching type of the variable item or Expression with resultType matching type of the variable item. </param>
-        internal AppendVariableActivity(string name, string activityType, string description, PipelineActivityState? state, ActivityOnInactiveMarkAs? onInactiveMarkAs, IList<PipelineActivityDependency> dependsOn, IList<PipelineActivityUserProperty> userProperties, IDictionary<string, BinaryData> additionalProperties, string variableName, DataFactoryElement<BinaryData> value) : base(name, activityType, description, state, onInactiveMarkAs, dependsOn, userProperties, additionalProperties)
+        internal AppendVariableActivity(string name, string activityType, string description, PipelineActivityState? state, ActivityOnInactiveMarkAs? onInactiveMarkAs, IList<PipelineActivityDependency> dependsOn, IList<PipelineActivityUserProperty> userProperties, IDictionary<string, DataFactoryElement<string>> additionalProperties, string variableName, DataFactoryElement<BinaryData> value) : base(name, activityType, description, state, onInactiveMarkAs, dependsOn, userProperties, additionalProperties)
         {
             VariableName = variableName;
             Value = value;
diff --git a/src/AzureDataFactory.TestingFramework/Generated/Models/AsanaLinkedService.Serialization.cs b/src/AzureDataFactory.TestingFramework/Generated/Models/AsanaLinkedService.Serialization.cs
index d7c49313..5780ff00 100644
--- a/src/AzureDataFactory.TestingFramework/Generated/Models/AsanaLinkedService.Serialization.cs
+++ b/src/AzureDataFactory.TestingFramework/Generated/Models/AsanaLinkedService.Serialization.cs
@@ -92,8 +92,8 @@ internal static AsanaLinkedService DeserializeAsanaLinkedService(JsonElement ele
             Optional<IList<BinaryData>> annotations = default;
             DataFactorySecretBaseDefinition apiToken = default;
             Optional<string> encryptedCredential = default;
-            IDictionary<string, BinaryData> additionalProperties = default;
-            Dictionary<string, BinaryData> additionalPropertiesDictionary = new Dictionary<string, BinaryData>();
+            IDictionary<string, DataFactoryElement<string>> additionalProperties = default;
+            Dictionary<string, DataFactoryElement<string>> additionalPropertiesDictionary = new Dictionary<string, DataFactoryElement<string>>();
             foreach (var property in element.EnumerateObject())
             {
                 if (property.NameEquals("type"u8))
@@ -172,7 +172,7 @@ internal static AsanaLinkedService DeserializeAsanaLinkedService(JsonElement ele
                     }
                     continue;
                 }
-                additionalPropertiesDictionary.Add(property.Name, BinaryData.FromString(property.Value.GetRawText()));
+                additionalPropertiesDictionary.Add(property.Name, JsonSerializer.Deserialize<DataFactoryElement<string>>(property.Value.GetRawText()));
             }
             additionalProperties = additionalPropertiesDictionary;
             return new AsanaLinkedService(type, connectVia.Value, description.Value, Optional.ToDictionary(parameters), Optional.ToList(annotations), additionalProperties, apiToken, encryptedCredential.Value);
diff --git a/src/AzureDataFactory.TestingFramework/Generated/Models/AsanaLinkedService.cs b/src/AzureDataFactory.TestingFramework/Generated/Models/AsanaLinkedService.cs
index a0791cfe..047b7ca2 100644
--- a/src/AzureDataFactory.TestingFramework/Generated/Models/AsanaLinkedService.cs
+++ b/src/AzureDataFactory.TestingFramework/Generated/Models/AsanaLinkedService.cs
@@ -33,7 +33,7 @@ public AsanaLinkedService(DataFactorySecretBaseDefinition apiToken)
         /// <param name="additionalProperties"> Additional Properties. </param>
         /// <param name="apiToken"> The api token for the Asana source. </param>
         /// <param name="encryptedCredential"> The encrypted credential used for authentication. Credentials are encrypted using the integration runtime credential manager. Type: string. </param>
-        internal AsanaLinkedService(string linkedServiceType, IntegrationRuntimeReference connectVia, string description, IDictionary<string, EntityParameterSpecification> parameters, IList<BinaryData> annotations, IDictionary<string, BinaryData> additionalProperties, DataFactorySecretBaseDefinition apiToken, string encryptedCredential) : base(linkedServiceType, connectVia, description, parameters, annotations, additionalProperties)
+        internal AsanaLinkedService(string linkedServiceType, IntegrationRuntimeReference connectVia, string description, IDictionary<string, EntityParameterSpecification> parameters, IList<BinaryData> annotations, IDictionary<string, DataFactoryElement<string>> additionalProperties, DataFactorySecretBaseDefinition apiToken, string encryptedCredential) : base(linkedServiceType, connectVia, description, parameters, annotations, additionalProperties)
         {
             ApiToken = apiToken;
             EncryptedCredential = encryptedCredential;
diff --git a/src/AzureDataFactory.TestingFramework/Generated/Models/AvroDataset.Serialization.cs b/src/AzureDataFactory.TestingFramework/Generated/Models/AvroDataset.Serialization.cs
index 81702590..fc83891f 100644
--- a/src/AzureDataFactory.TestingFramework/Generated/Models/AvroDataset.Serialization.cs
+++ b/src/AzureDataFactory.TestingFramework/Generated/Models/AvroDataset.Serialization.cs
@@ -116,8 +116,8 @@ internal static AvroDataset DeserializeAvroDataset(JsonElement element)
             Optional<DatasetLocation> location = default;
             Optional<DataFactoryElement<string>> avroCompressionCodec = default;
             Optional<int> avroCompressionLevel = default;
-            IDictionary<string, BinaryData> additionalProperties = default;
-            Dictionary<string, BinaryData> additionalPropertiesDictionary = new Dictionary<string, BinaryData>();
+            IDictionary<string, DataFactoryElement<string>> additionalProperties = default;
+            Dictionary<string, DataFactoryElement<string>> additionalPropertiesDictionary = new Dictionary<string, DataFactoryElement<string>>();
             foreach (var property in element.EnumerateObject())
             {
                 if (property.NameEquals("type"u8))
@@ -236,7 +236,7 @@ internal static AvroDataset DeserializeAvroDataset(JsonElement element)
                     }
                     continue;
                 }
-                additionalPropertiesDictionary.Add(property.Name, BinaryData.FromString(property.Value.GetRawText()));
+                additionalPropertiesDictionary.Add(property.Name, JsonSerializer.Deserialize<DataFactoryElement<string>>(property.Value.GetRawText()));
             }
             additionalProperties = additionalPropertiesDictionary;
             return new AvroDataset(type, description.Value, structure.Value, schema.Value, linkedServiceName, Optional.ToDictionary(parameters), Optional.ToList(annotations), folder.Value, additionalProperties, location.Value, avroCompressionCodec.Value, Optional.ToNullable(avroCompressionLevel));
diff --git a/src/AzureDataFactory.TestingFramework/Generated/Models/AvroDataset.cs b/src/AzureDataFactory.TestingFramework/Generated/Models/AvroDataset.cs
index b3296071..47863149 100644
--- a/src/AzureDataFactory.TestingFramework/Generated/Models/AvroDataset.cs
+++ b/src/AzureDataFactory.TestingFramework/Generated/Models/AvroDataset.cs
@@ -40,7 +40,7 @@ public AvroDataset(DataFactoryLinkedServiceReference linkedServiceName) : base(l
         /// </param>
         /// <param name="avroCompressionCodec"> The data avroCompressionCodec. Type: string (or Expression with resultType string). </param>
         /// <param name="avroCompressionLevel"></param>
-        internal AvroDataset(string datasetType, string description, DataFactoryElement<IList<DatasetDataElement>> structure, DataFactoryElement<IList<DatasetSchemaDataElement>> schema, DataFactoryLinkedServiceReference linkedServiceName, IDictionary<string, EntityParameterSpecification> parameters, IList<BinaryData> annotations, DatasetFolder folder, IDictionary<string, BinaryData> additionalProperties, DatasetLocation dataLocation, DataFactoryElement<string> avroCompressionCodec, int? avroCompressionLevel) : base(datasetType, description, structure, schema, linkedServiceName, parameters, annotations, folder, additionalProperties)
+        internal AvroDataset(string datasetType, string description, DataFactoryElement<IList<DatasetDataElement>> structure, DataFactoryElement<IList<DatasetSchemaDataElement>> schema, DataFactoryLinkedServiceReference linkedServiceName, IDictionary<string, EntityParameterSpecification> parameters, IList<BinaryData> annotations, DatasetFolder folder, IDictionary<string, DataFactoryElement<string>> additionalProperties, DatasetLocation dataLocation, DataFactoryElement<string> avroCompressionCodec, int? avroCompressionLevel) : base(datasetType, description, structure, schema, linkedServiceName, parameters, annotations, folder, additionalProperties)
         {
             DataLocation = dataLocation;
             AvroCompressionCodec = avroCompressionCodec;
diff --git a/src/AzureDataFactory.TestingFramework/Generated/Models/AvroSink.Serialization.cs b/src/AzureDataFactory.TestingFramework/Generated/Models/AvroSink.Serialization.cs
index 6b114595..7947b634 100644
--- a/src/AzureDataFactory.TestingFramework/Generated/Models/AvroSink.Serialization.cs
+++ b/src/AzureDataFactory.TestingFramework/Generated/Models/AvroSink.Serialization.cs
@@ -85,8 +85,8 @@ internal static AvroSink DeserializeAvroSink(JsonElement element)
             Optional<DataFactoryElement<string>> sinkRetryWait = default;
             Optional<DataFactoryElement<int>> maxConcurrentConnections = default;
             Optional<DataFactoryElement<bool>> disableMetricsCollection = default;
-            IDictionary<string, BinaryData> additionalProperties = default;
-            Dictionary<string, BinaryData> additionalPropertiesDictionary = new Dictionary<string, BinaryData>();
+            IDictionary<string, DataFactoryElement<string>> additionalProperties = default;
+            Dictionary<string, DataFactoryElement<string>> additionalPropertiesDictionary = new Dictionary<string, DataFactoryElement<string>>();
             foreach (var property in element.EnumerateObject())
             {
                 if (property.NameEquals("storeSettings"u8))
@@ -166,7 +166,7 @@ internal static AvroSink DeserializeAvroSink(JsonElement element)
                     disableMetricsCollection = JsonSerializer.Deserialize<DataFactoryElement<bool>>(property.Value.GetRawText());
                     continue;
                 }
-                additionalPropertiesDictionary.Add(property.Name, BinaryData.FromString(property.Value.GetRawText()));
+                additionalPropertiesDictionary.Add(property.Name, JsonSerializer.Deserialize<DataFactoryElement<string>>(property.Value.GetRawText()));
             }
             additionalProperties = additionalPropertiesDictionary;
             return new AvroSink(type, writeBatchSize.Value, writeBatchTimeout.Value, sinkRetryCount.Value, sinkRetryWait.Value, maxConcurrentConnections.Value, disableMetricsCollection.Value, additionalProperties, storeSettings.Value, formatSettings.Value);
diff --git a/src/AzureDataFactory.TestingFramework/Generated/Models/AvroSink.cs b/src/AzureDataFactory.TestingFramework/Generated/Models/AvroSink.cs
index 84491c13..a6404449 100644
--- a/src/AzureDataFactory.TestingFramework/Generated/Models/AvroSink.cs
+++ b/src/AzureDataFactory.TestingFramework/Generated/Models/AvroSink.cs
@@ -33,7 +33,7 @@ public AvroSink()
         /// The available derived classes include <see cref="AzureBlobFSWriteSettings"/>, <see cref="AzureBlobStorageWriteSettings"/>, <see cref="AzureDataLakeStoreWriteSettings"/>, <see cref="AzureFileStorageWriteSettings"/>, <see cref="FileServerWriteSettings"/> and <see cref="SftpWriteSettings"/>.
         /// </param>
         /// <param name="formatSettings"> Avro format settings. </param>
-        internal AvroSink(string copySinkType, DataFactoryElement<int> writeBatchSize, DataFactoryElement<string> writeBatchTimeout, DataFactoryElement<int> sinkRetryCount, DataFactoryElement<string> sinkRetryWait, DataFactoryElement<int> maxConcurrentConnections, DataFactoryElement<bool> disableMetricsCollection, IDictionary<string, BinaryData> additionalProperties, StoreWriteSettings storeSettings, AvroWriteSettings formatSettings) : base(copySinkType, writeBatchSize, writeBatchTimeout, sinkRetryCount, sinkRetryWait, maxConcurrentConnections, disableMetricsCollection, additionalProperties)
+        internal AvroSink(string copySinkType, DataFactoryElement<int> writeBatchSize, DataFactoryElement<string> writeBatchTimeout, DataFactoryElement<int> sinkRetryCount, DataFactoryElement<string> sinkRetryWait, DataFactoryElement<int> maxConcurrentConnections, DataFactoryElement<bool> disableMetricsCollection, IDictionary<string, DataFactoryElement<string>> additionalProperties, StoreWriteSettings storeSettings, AvroWriteSettings formatSettings) : base(copySinkType, writeBatchSize, writeBatchTimeout, sinkRetryCount, sinkRetryWait, maxConcurrentConnections, disableMetricsCollection, additionalProperties)
         {
             StoreSettings = storeSettings;
             FormatSettings = formatSettings;
diff --git a/src/AzureDataFactory.TestingFramework/Generated/Models/AvroSource.Serialization.cs b/src/AzureDataFactory.TestingFramework/Generated/Models/AvroSource.Serialization.cs
index 9b9a86ce..dd2c0ec0 100644
--- a/src/AzureDataFactory.TestingFramework/Generated/Models/AvroSource.Serialization.cs
+++ b/src/AzureDataFactory.TestingFramework/Generated/Models/AvroSource.Serialization.cs
@@ -77,8 +77,8 @@ internal static AvroSource DeserializeAvroSource(JsonElement element)
             Optional<DataFactoryElement<string>> sourceRetryWait = default;
             Optional<DataFactoryElement<int>> maxConcurrentConnections = default;
             Optional<DataFactoryElement<bool>> disableMetricsCollection = default;
-            IDictionary<string, BinaryData> additionalProperties = default;
-            Dictionary<string, BinaryData> additionalPropertiesDictionary = new Dictionary<string, BinaryData>();
+            IDictionary<string, DataFactoryElement<string>> additionalProperties = default;
+            Dictionary<string, DataFactoryElement<string>> additionalPropertiesDictionary = new Dictionary<string, DataFactoryElement<string>>();
             foreach (var property in element.EnumerateObject())
             {
                 if (property.NameEquals("storeSettings"u8))
@@ -140,7 +140,7 @@ internal static AvroSource DeserializeAvroSource(JsonElement element)
                     disableMetricsCollection = JsonSerializer.Deserialize<DataFactoryElement<bool>>(property.Value.GetRawText());
                     continue;
                 }
-                additionalPropertiesDictionary.Add(property.Name, BinaryData.FromString(property.Value.GetRawText()));
+                additionalPropertiesDictionary.Add(property.Name, JsonSerializer.Deserialize<DataFactoryElement<string>>(property.Value.GetRawText()));
             }
             additionalProperties = additionalPropertiesDictionary;
             return new AvroSource(type, sourceRetryCount.Value, sourceRetryWait.Value, maxConcurrentConnections.Value, disableMetricsCollection.Value, additionalProperties, storeSettings.Value, additionalColumns.Value);
diff --git a/src/AzureDataFactory.TestingFramework/Generated/Models/AvroSource.cs b/src/AzureDataFactory.TestingFramework/Generated/Models/AvroSource.cs
index 2f4206aa..196ef62a 100644
--- a/src/AzureDataFactory.TestingFramework/Generated/Models/AvroSource.cs
+++ b/src/AzureDataFactory.TestingFramework/Generated/Models/AvroSource.cs
@@ -31,7 +31,7 @@ public AvroSource()
         /// The available derived classes include <see cref="AmazonS3CompatibleReadSettings"/>, <see cref="AmazonS3ReadSettings"/>, <see cref="AzureBlobFSReadSettings"/>, <see cref="AzureBlobStorageReadSettings"/>, <see cref="AzureDataLakeStoreReadSettings"/>, <see cref="AzureFileStorageReadSettings"/>, <see cref="FileServerReadSettings"/>, <see cref="FtpReadSettings"/>, <see cref="GoogleCloudStorageReadSettings"/>, <see cref="HdfsReadSettings"/>, <see cref="HttpReadSettings"/>, <see cref="OracleCloudStorageReadSettings"/> and <see cref="SftpReadSettings"/>.
         /// </param>
         /// <param name="additionalColumns"> Specifies the additional columns to be added to source data. Type: array of objects(AdditionalColumns) (or Expression with resultType array of objects). </param>
-        internal AvroSource(string copySourceType, DataFactoryElement<int> sourceRetryCount, DataFactoryElement<string> sourceRetryWait, DataFactoryElement<int> maxConcurrentConnections, DataFactoryElement<bool> disableMetricsCollection, IDictionary<string, BinaryData> additionalProperties, StoreReadSettings storeSettings, BinaryData additionalColumns) : base(copySourceType, sourceRetryCount, sourceRetryWait, maxConcurrentConnections, disableMetricsCollection, additionalProperties)
+        internal AvroSource(string copySourceType, DataFactoryElement<int> sourceRetryCount, DataFactoryElement<string> sourceRetryWait, DataFactoryElement<int> maxConcurrentConnections, DataFactoryElement<bool> disableMetricsCollection, IDictionary<string, DataFactoryElement<string>> additionalProperties, StoreReadSettings storeSettings, BinaryData additionalColumns) : base(copySourceType, sourceRetryCount, sourceRetryWait, maxConcurrentConnections, disableMetricsCollection, additionalProperties)
         {
             StoreSettings = storeSettings;
             AdditionalColumns = additionalColumns;
diff --git a/src/AzureDataFactory.TestingFramework/Generated/Models/AvroWriteSettings.Serialization.cs b/src/AzureDataFactory.TestingFramework/Generated/Models/AvroWriteSettings.Serialization.cs
index db98561d..43daddd8 100644
--- a/src/AzureDataFactory.TestingFramework/Generated/Models/AvroWriteSettings.Serialization.cs
+++ b/src/AzureDataFactory.TestingFramework/Generated/Models/AvroWriteSettings.Serialization.cs
@@ -61,8 +61,8 @@ internal static AvroWriteSettings DeserializeAvroWriteSettings(JsonElement eleme
             Optional<DataFactoryElement<int>> maxRowsPerFile = default;
             Optional<DataFactoryElement<string>> fileNamePrefix = default;
             string type = default;
-            IDictionary<string, BinaryData> additionalProperties = default;
-            Dictionary<string, BinaryData> additionalPropertiesDictionary = new Dictionary<string, BinaryData>();
+            IDictionary<string, DataFactoryElement<string>> additionalProperties = default;
+            Dictionary<string, DataFactoryElement<string>> additionalPropertiesDictionary = new Dictionary<string, DataFactoryElement<string>>();
             foreach (var property in element.EnumerateObject())
             {
                 if (property.NameEquals("recordName"u8))
@@ -98,7 +98,7 @@ internal static AvroWriteSettings DeserializeAvroWriteSettings(JsonElement eleme
                     type = property.Value.GetString();
                     continue;
                 }
-                additionalPropertiesDictionary.Add(property.Name, BinaryData.FromString(property.Value.GetRawText()));
+                additionalPropertiesDictionary.Add(property.Name, JsonSerializer.Deserialize<DataFactoryElement<string>>(property.Value.GetRawText()));
             }
             additionalProperties = additionalPropertiesDictionary;
             return new AvroWriteSettings(type, additionalProperties, recordName.Value, recordNamespace.Value, maxRowsPerFile.Value, fileNamePrefix.Value);
diff --git a/src/AzureDataFactory.TestingFramework/Generated/Models/AvroWriteSettings.cs b/src/AzureDataFactory.TestingFramework/Generated/Models/AvroWriteSettings.cs
index d8838e39..749df377 100644
--- a/src/AzureDataFactory.TestingFramework/Generated/Models/AvroWriteSettings.cs
+++ b/src/AzureDataFactory.TestingFramework/Generated/Models/AvroWriteSettings.cs
@@ -25,7 +25,7 @@ public AvroWriteSettings()
         /// <param name="recordNamespace"> Record namespace in the write result. </param>
         /// <param name="maxRowsPerFile"> Limit the written file's row count to be smaller than or equal to the specified count. Type: integer (or Expression with resultType integer). </param>
         /// <param name="fileNamePrefix"> Specifies the file name pattern &lt;fileNamePrefix&gt;_&lt;fileIndex&gt;.&lt;fileExtension&gt; when copy from non-file based store without partitionOptions. Type: string (or Expression with resultType string). </param>
-        internal AvroWriteSettings(string formatWriteSettingsType, IDictionary<string, BinaryData> additionalProperties, string recordName, string recordNamespace, DataFactoryElement<int> maxRowsPerFile, DataFactoryElement<string> fileNamePrefix) : base(formatWriteSettingsType, additionalProperties)
+        internal AvroWriteSettings(string formatWriteSettingsType, IDictionary<string, DataFactoryElement<string>> additionalProperties, string recordName, string recordNamespace, DataFactoryElement<int> maxRowsPerFile, DataFactoryElement<string> fileNamePrefix) : base(formatWriteSettingsType, additionalProperties)
         {
             RecordName = recordName;
             RecordNamespace = recordNamespace;
diff --git a/src/AzureDataFactory.TestingFramework/Generated/Models/AzureBatchLinkedService.Serialization.cs b/src/AzureDataFactory.TestingFramework/Generated/Models/AzureBatchLinkedService.Serialization.cs
index 5a18bc50..a094e1c7 100644
--- a/src/AzureDataFactory.TestingFramework/Generated/Models/AzureBatchLinkedService.Serialization.cs
+++ b/src/AzureDataFactory.TestingFramework/Generated/Models/AzureBatchLinkedService.Serialization.cs
@@ -113,8 +113,8 @@ internal static AzureBatchLinkedService DeserializeAzureBatchLinkedService(JsonE
             DataFactoryLinkedServiceReference linkedServiceName = default;
             Optional<string> encryptedCredential = default;
             Optional<DataFactoryCredentialReference> credential = default;
-            IDictionary<string, BinaryData> additionalProperties = default;
-            Dictionary<string, BinaryData> additionalPropertiesDictionary = new Dictionary<string, BinaryData>();
+            IDictionary<string, DataFactoryElement<string>> additionalProperties = default;
+            Dictionary<string, DataFactoryElement<string>> additionalPropertiesDictionary = new Dictionary<string, DataFactoryElement<string>>();
             foreach (var property in element.EnumerateObject())
             {
                 if (property.NameEquals("type"u8))
@@ -226,7 +226,7 @@ internal static AzureBatchLinkedService DeserializeAzureBatchLinkedService(JsonE
                     }
                     continue;
                 }
-                additionalPropertiesDictionary.Add(property.Name, BinaryData.FromString(property.Value.GetRawText()));
+                additionalPropertiesDictionary.Add(property.Name, JsonSerializer.Deserialize<DataFactoryElement<string>>(property.Value.GetRawText()));
             }
             additionalProperties = additionalPropertiesDictionary;
             return new AzureBatchLinkedService(type, connectVia.Value, description.Value, Optional.ToDictionary(parameters), Optional.ToList(annotations), additionalProperties, accountName, accessKey, batchUri, poolName, linkedServiceName, encryptedCredential.Value, credential.Value);
diff --git a/src/AzureDataFactory.TestingFramework/Generated/Models/AzureBatchLinkedService.cs b/src/AzureDataFactory.TestingFramework/Generated/Models/AzureBatchLinkedService.cs
index e381185d..584039fe 100644
--- a/src/AzureDataFactory.TestingFramework/Generated/Models/AzureBatchLinkedService.cs
+++ b/src/AzureDataFactory.TestingFramework/Generated/Models/AzureBatchLinkedService.cs
@@ -47,7 +47,7 @@ public AzureBatchLinkedService(DataFactoryElement<string> accountName, DataFacto
         /// <param name="linkedServiceName"> The Azure Storage linked service reference. </param>
         /// <param name="encryptedCredential"> The encrypted credential used for authentication. Credentials are encrypted using the integration runtime credential manager. Type: string. </param>
         /// <param name="credential"> The credential reference containing authentication information. </param>
-        internal AzureBatchLinkedService(string linkedServiceType, IntegrationRuntimeReference connectVia, string description, IDictionary<string, EntityParameterSpecification> parameters, IList<BinaryData> annotations, IDictionary<string, BinaryData> additionalProperties, DataFactoryElement<string> accountName, DataFactorySecretBaseDefinition accessKey, DataFactoryElement<string> batchUri, DataFactoryElement<string> poolName, DataFactoryLinkedServiceReference linkedServiceName, string encryptedCredential, DataFactoryCredentialReference credential) : base(linkedServiceType, connectVia, description, parameters, annotations, additionalProperties)
+        internal AzureBatchLinkedService(string linkedServiceType, IntegrationRuntimeReference connectVia, string description, IDictionary<string, EntityParameterSpecification> parameters, IList<BinaryData> annotations, IDictionary<string, DataFactoryElement<string>> additionalProperties, DataFactoryElement<string> accountName, DataFactorySecretBaseDefinition accessKey, DataFactoryElement<string> batchUri, DataFactoryElement<string> poolName, DataFactoryLinkedServiceReference linkedServiceName, string encryptedCredential, DataFactoryCredentialReference credential) : base(linkedServiceType, connectVia, description, parameters, annotations, additionalProperties)
         {
             AccountName = accountName;
             AccessKey = accessKey;
diff --git a/src/AzureDataFactory.TestingFramework/Generated/Models/AzureBlobDataset.Serialization.cs b/src/AzureDataFactory.TestingFramework/Generated/Models/AzureBlobDataset.Serialization.cs
index 86ebd79f..1481a713 100644
--- a/src/AzureDataFactory.TestingFramework/Generated/Models/AzureBlobDataset.Serialization.cs
+++ b/src/AzureDataFactory.TestingFramework/Generated/Models/AzureBlobDataset.Serialization.cs
@@ -140,8 +140,8 @@ internal static AzureBlobDataset DeserializeAzureBlobDataset(JsonElement element
             Optional<DataFactoryElement<string>> modifiedDatetimeEnd = default;
             Optional<DatasetStorageFormat> format = default;
             Optional<DatasetCompression> compression = default;
-            IDictionary<string, BinaryData> additionalProperties = default;
-            Dictionary<string, BinaryData> additionalPropertiesDictionary = new Dictionary<string, BinaryData>();
+            IDictionary<string, DataFactoryElement<string>> additionalProperties = default;
+            Dictionary<string, DataFactoryElement<string>> additionalPropertiesDictionary = new Dictionary<string, DataFactoryElement<string>>();
             foreach (var property in element.EnumerateObject())
             {
                 if (property.NameEquals("type"u8))
@@ -296,7 +296,7 @@ internal static AzureBlobDataset DeserializeAzureBlobDataset(JsonElement element
                     }
                     continue;
                 }
-                additionalPropertiesDictionary.Add(property.Name, BinaryData.FromString(property.Value.GetRawText()));
+                additionalPropertiesDictionary.Add(property.Name, JsonSerializer.Deserialize<DataFactoryElement<string>>(property.Value.GetRawText()));
             }
             additionalProperties = additionalPropertiesDictionary;
             return new AzureBlobDataset(type, description.Value, structure.Value, schema.Value, linkedServiceName, Optional.ToDictionary(parameters), Optional.ToList(annotations), folder.Value, additionalProperties, folderPath.Value, tableRootLocation.Value, fileName.Value, modifiedDatetimeStart.Value, modifiedDatetimeEnd.Value, format.Value, compression.Value);
diff --git a/src/AzureDataFactory.TestingFramework/Generated/Models/AzureBlobDataset.cs b/src/AzureDataFactory.TestingFramework/Generated/Models/AzureBlobDataset.cs
index 94bcb742..8878b6b1 100644
--- a/src/AzureDataFactory.TestingFramework/Generated/Models/AzureBlobDataset.cs
+++ b/src/AzureDataFactory.TestingFramework/Generated/Models/AzureBlobDataset.cs
@@ -44,7 +44,7 @@ public AzureBlobDataset(DataFactoryLinkedServiceReference linkedServiceName) : b
         /// The available derived classes include <see cref="DatasetAvroFormat"/>, <see cref="DatasetJsonFormat"/>, <see cref="DatasetOrcFormat"/>, <see cref="DatasetParquetFormat"/> and <see cref="DatasetTextFormat"/>.
         /// </param>
         /// <param name="compression"> The data compression method used for the blob storage. </param>
-        internal AzureBlobDataset(string datasetType, string description, DataFactoryElement<IList<DatasetDataElement>> structure, DataFactoryElement<IList<DatasetSchemaDataElement>> schema, DataFactoryLinkedServiceReference linkedServiceName, IDictionary<string, EntityParameterSpecification> parameters, IList<BinaryData> annotations, DatasetFolder folder, IDictionary<string, BinaryData> additionalProperties, DataFactoryElement<string> folderPath, DataFactoryElement<string> tableRootLocation, DataFactoryElement<string> fileName, DataFactoryElement<string> modifiedDatetimeStart, DataFactoryElement<string> modifiedDatetimeEnd, DatasetStorageFormat format, DatasetCompression compression) : base(datasetType, description, structure, schema, linkedServiceName, parameters, annotations, folder, additionalProperties)
+        internal AzureBlobDataset(string datasetType, string description, DataFactoryElement<IList<DatasetDataElement>> structure, DataFactoryElement<IList<DatasetSchemaDataElement>> schema, DataFactoryLinkedServiceReference linkedServiceName, IDictionary<string, EntityParameterSpecification> parameters, IList<BinaryData> annotations, DatasetFolder folder, IDictionary<string, DataFactoryElement<string>> additionalProperties, DataFactoryElement<string> folderPath, DataFactoryElement<string> tableRootLocation, DataFactoryElement<string> fileName, DataFactoryElement<string> modifiedDatetimeStart, DataFactoryElement<string> modifiedDatetimeEnd, DatasetStorageFormat format, DatasetCompression compression) : base(datasetType, description, structure, schema, linkedServiceName, parameters, annotations, folder, additionalProperties)
         {
             FolderPath = folderPath;
             TableRootLocation = tableRootLocation;
diff --git a/src/AzureDataFactory.TestingFramework/Generated/Models/AzureBlobFSDataset.Serialization.cs b/src/AzureDataFactory.TestingFramework/Generated/Models/AzureBlobFSDataset.Serialization.cs
index b097ad1f..1845c637 100644
--- a/src/AzureDataFactory.TestingFramework/Generated/Models/AzureBlobFSDataset.Serialization.cs
+++ b/src/AzureDataFactory.TestingFramework/Generated/Models/AzureBlobFSDataset.Serialization.cs
@@ -122,8 +122,8 @@ internal static AzureBlobFSDataset DeserializeAzureBlobFSDataset(JsonElement ele
             Optional<DataFactoryElement<string>> fileName = default;
             Optional<DatasetStorageFormat> format = default;
             Optional<DatasetCompression> compression = default;
-            IDictionary<string, BinaryData> additionalProperties = default;
-            Dictionary<string, BinaryData> additionalPropertiesDictionary = new Dictionary<string, BinaryData>();
+            IDictionary<string, DataFactoryElement<string>> additionalProperties = default;
+            Dictionary<string, DataFactoryElement<string>> additionalPropertiesDictionary = new Dictionary<string, DataFactoryElement<string>>();
             foreach (var property in element.EnumerateObject())
             {
                 if (property.NameEquals("type"u8))
@@ -251,7 +251,7 @@ internal static AzureBlobFSDataset DeserializeAzureBlobFSDataset(JsonElement ele
                     }
                     continue;
                 }
-                additionalPropertiesDictionary.Add(property.Name, BinaryData.FromString(property.Value.GetRawText()));
+                additionalPropertiesDictionary.Add(property.Name, JsonSerializer.Deserialize<DataFactoryElement<string>>(property.Value.GetRawText()));
             }
             additionalProperties = additionalPropertiesDictionary;
             return new AzureBlobFSDataset(type, description.Value, structure.Value, schema.Value, linkedServiceName, Optional.ToDictionary(parameters), Optional.ToList(annotations), folder.Value, additionalProperties, folderPath.Value, fileName.Value, format.Value, compression.Value);
diff --git a/src/AzureDataFactory.TestingFramework/Generated/Models/AzureBlobFSDataset.cs b/src/AzureDataFactory.TestingFramework/Generated/Models/AzureBlobFSDataset.cs
index 9586ba2a..c9527280 100644
--- a/src/AzureDataFactory.TestingFramework/Generated/Models/AzureBlobFSDataset.cs
+++ b/src/AzureDataFactory.TestingFramework/Generated/Models/AzureBlobFSDataset.cs
@@ -41,7 +41,7 @@ public AzureBlobFSDataset(DataFactoryLinkedServiceReference linkedServiceName) :
         /// The available derived classes include <see cref="DatasetAvroFormat"/>, <see cref="DatasetJsonFormat"/>, <see cref="DatasetOrcFormat"/>, <see cref="DatasetParquetFormat"/> and <see cref="DatasetTextFormat"/>.
         /// </param>
         /// <param name="compression"> The data compression method used for the blob storage. </param>
-        internal AzureBlobFSDataset(string datasetType, string description, DataFactoryElement<IList<DatasetDataElement>> structure, DataFactoryElement<IList<DatasetSchemaDataElement>> schema, DataFactoryLinkedServiceReference linkedServiceName, IDictionary<string, EntityParameterSpecification> parameters, IList<BinaryData> annotations, DatasetFolder folder, IDictionary<string, BinaryData> additionalProperties, DataFactoryElement<string> folderPath, DataFactoryElement<string> fileName, DatasetStorageFormat format, DatasetCompression compression) : base(datasetType, description, structure, schema, linkedServiceName, parameters, annotations, folder, additionalProperties)
+        internal AzureBlobFSDataset(string datasetType, string description, DataFactoryElement<IList<DatasetDataElement>> structure, DataFactoryElement<IList<DatasetSchemaDataElement>> schema, DataFactoryLinkedServiceReference linkedServiceName, IDictionary<string, EntityParameterSpecification> parameters, IList<BinaryData> annotations, DatasetFolder folder, IDictionary<string, DataFactoryElement<string>> additionalProperties, DataFactoryElement<string> folderPath, DataFactoryElement<string> fileName, DatasetStorageFormat format, DatasetCompression compression) : base(datasetType, description, structure, schema, linkedServiceName, parameters, annotations, folder, additionalProperties)
         {
             FolderPath = folderPath;
             FileName = fileName;
diff --git a/src/AzureDataFactory.TestingFramework/Generated/Models/AzureBlobFSLinkedService.Serialization.cs b/src/AzureDataFactory.TestingFramework/Generated/Models/AzureBlobFSLinkedService.Serialization.cs
index 59b23a81..53db1b06 100644
--- a/src/AzureDataFactory.TestingFramework/Generated/Models/AzureBlobFSLinkedService.Serialization.cs
+++ b/src/AzureDataFactory.TestingFramework/Generated/Models/AzureBlobFSLinkedService.Serialization.cs
@@ -156,8 +156,8 @@ internal static AzureBlobFSLinkedService DeserializeAzureBlobFSLinkedService(Jso
             Optional<DataFactorySecretBaseDefinition> servicePrincipalCredential = default;
             Optional<DataFactoryElement<string>> sasUri = default;
             Optional<DataFactorySecretBaseDefinition> sasToken = default;
-            IDictionary<string, BinaryData> additionalProperties = default;
-            Dictionary<string, BinaryData> additionalPropertiesDictionary = new Dictionary<string, BinaryData>();
+            IDictionary<string, DataFactoryElement<string>> additionalProperties = default;
+            Dictionary<string, DataFactoryElement<string>> additionalPropertiesDictionary = new Dictionary<string, DataFactoryElement<string>>();
             foreach (var property in element.EnumerateObject())
             {
                 if (property.NameEquals("type"u8))
@@ -330,7 +330,7 @@ internal static AzureBlobFSLinkedService DeserializeAzureBlobFSLinkedService(Jso
                     }
                     continue;
                 }
-                additionalPropertiesDictionary.Add(property.Name, BinaryData.FromString(property.Value.GetRawText()));
+                additionalPropertiesDictionary.Add(property.Name, JsonSerializer.Deserialize<DataFactoryElement<string>>(property.Value.GetRawText()));
             }
             additionalProperties = additionalPropertiesDictionary;
             return new AzureBlobFSLinkedService(type, connectVia.Value, description.Value, Optional.ToDictionary(parameters), Optional.ToList(annotations), additionalProperties, url.Value, accountKey.Value, servicePrincipalId.Value, servicePrincipalKey, tenant.Value, azureCloudType.Value, encryptedCredential.Value, credential.Value, servicePrincipalCredentialType.Value, servicePrincipalCredential, sasUri.Value, sasToken);
diff --git a/src/AzureDataFactory.TestingFramework/Generated/Models/AzureBlobFSLinkedService.cs b/src/AzureDataFactory.TestingFramework/Generated/Models/AzureBlobFSLinkedService.cs
index 3c121ca8..7d21b65c 100644
--- a/src/AzureDataFactory.TestingFramework/Generated/Models/AzureBlobFSLinkedService.cs
+++ b/src/AzureDataFactory.TestingFramework/Generated/Models/AzureBlobFSLinkedService.cs
@@ -37,7 +37,7 @@ public AzureBlobFSLinkedService()
         /// <param name="servicePrincipalCredential"> The credential of the service principal object in Azure Active Directory. If servicePrincipalCredentialType is 'ServicePrincipalKey', servicePrincipalCredential can be SecureString or AzureKeyVaultSecretReference. If servicePrincipalCredentialType is 'ServicePrincipalCert', servicePrincipalCredential can only be AzureKeyVaultSecretReference. </param>
         /// <param name="sasUri"> SAS URI of the Azure Data Lake Storage Gen2 service. Type: string, SecureString or AzureKeyVaultSecretReference. </param>
         /// <param name="sasToken"> The Azure key vault secret reference of sasToken in sas uri. </param>
-        internal AzureBlobFSLinkedService(string linkedServiceType, IntegrationRuntimeReference connectVia, string description, IDictionary<string, EntityParameterSpecification> parameters, IList<BinaryData> annotations, IDictionary<string, BinaryData> additionalProperties, DataFactoryElement<string> uri, DataFactoryElement<string> accountKey, DataFactoryElement<string> servicePrincipalId, DataFactorySecretBaseDefinition servicePrincipalKey, DataFactoryElement<string> tenant, DataFactoryElement<string> azureCloudType, string encryptedCredential, DataFactoryCredentialReference credential, DataFactoryElement<string> servicePrincipalCredentialType, DataFactorySecretBaseDefinition servicePrincipalCredential, DataFactoryElement<string> sasUri, DataFactorySecretBaseDefinition sasToken) : base(linkedServiceType, connectVia, description, parameters, annotations, additionalProperties)
+        internal AzureBlobFSLinkedService(string linkedServiceType, IntegrationRuntimeReference connectVia, string description, IDictionary<string, EntityParameterSpecification> parameters, IList<BinaryData> annotations, IDictionary<string, DataFactoryElement<string>> additionalProperties, DataFactoryElement<string> uri, DataFactoryElement<string> accountKey, DataFactoryElement<string> servicePrincipalId, DataFactorySecretBaseDefinition servicePrincipalKey, DataFactoryElement<string> tenant, DataFactoryElement<string> azureCloudType, string encryptedCredential, DataFactoryCredentialReference credential, DataFactoryElement<string> servicePrincipalCredentialType, DataFactorySecretBaseDefinition servicePrincipalCredential, DataFactoryElement<string> sasUri, DataFactorySecretBaseDefinition sasToken) : base(linkedServiceType, connectVia, description, parameters, annotations, additionalProperties)
         {
             Uri = uri;
             AccountKey = accountKey;
diff --git a/src/AzureDataFactory.TestingFramework/Generated/Models/AzureBlobFSLocation.Serialization.cs b/src/AzureDataFactory.TestingFramework/Generated/Models/AzureBlobFSLocation.Serialization.cs
index 2f196092..f03b2c60 100644
--- a/src/AzureDataFactory.TestingFramework/Generated/Models/AzureBlobFSLocation.Serialization.cs
+++ b/src/AzureDataFactory.TestingFramework/Generated/Models/AzureBlobFSLocation.Serialization.cs
@@ -55,8 +55,8 @@ internal static AzureBlobFSLocation DeserializeAzureBlobFSLocation(JsonElement e
             string type = default;
             Optional<DataFactoryElement<string>> folderPath = default;
             Optional<DataFactoryElement<string>> fileName = default;
-            IDictionary<string, BinaryData> additionalProperties = default;
-            Dictionary<string, BinaryData> additionalPropertiesDictionary = new Dictionary<string, BinaryData>();
+            IDictionary<string, DataFactoryElement<string>> additionalProperties = default;
+            Dictionary<string, DataFactoryElement<string>> additionalPropertiesDictionary = new Dictionary<string, DataFactoryElement<string>>();
             foreach (var property in element.EnumerateObject())
             {
                 if (property.NameEquals("fileSystem"u8))
@@ -91,7 +91,7 @@ internal static AzureBlobFSLocation DeserializeAzureBlobFSLocation(JsonElement e
                     fileName = JsonSerializer.Deserialize<DataFactoryElement<string>>(property.Value.GetRawText());
                     continue;
                 }
-                additionalPropertiesDictionary.Add(property.Name, BinaryData.FromString(property.Value.GetRawText()));
+                additionalPropertiesDictionary.Add(property.Name, JsonSerializer.Deserialize<DataFactoryElement<string>>(property.Value.GetRawText()));
             }
             additionalProperties = additionalPropertiesDictionary;
             return new AzureBlobFSLocation(type, folderPath.Value, fileName.Value, additionalProperties, fileSystem.Value);
diff --git a/src/AzureDataFactory.TestingFramework/Generated/Models/AzureBlobFSLocation.cs b/src/AzureDataFactory.TestingFramework/Generated/Models/AzureBlobFSLocation.cs
index f7f12dfc..7e3368a9 100644
--- a/src/AzureDataFactory.TestingFramework/Generated/Models/AzureBlobFSLocation.cs
+++ b/src/AzureDataFactory.TestingFramework/Generated/Models/AzureBlobFSLocation.cs
@@ -24,7 +24,7 @@ public AzureBlobFSLocation()
         /// <param name="fileName"> Specify the file name of dataset. Type: string (or Expression with resultType string). </param>
         /// <param name="additionalProperties"> Additional Properties. </param>
         /// <param name="fileSystem"> Specify the fileSystem of azure blobFS. Type: string (or Expression with resultType string). </param>
-        internal AzureBlobFSLocation(string datasetLocationType, DataFactoryElement<string> folderPath, DataFactoryElement<string> fileName, IDictionary<string, BinaryData> additionalProperties, DataFactoryElement<string> fileSystem) : base(datasetLocationType, folderPath, fileName, additionalProperties)
+        internal AzureBlobFSLocation(string datasetLocationType, DataFactoryElement<string> folderPath, DataFactoryElement<string> fileName, IDictionary<string, DataFactoryElement<string>> additionalProperties, DataFactoryElement<string> fileSystem) : base(datasetLocationType, folderPath, fileName, additionalProperties)
         {
             FileSystem = fileSystem;
             DatasetLocationType = datasetLocationType ?? "AzureBlobFSLocation";
diff --git a/src/AzureDataFactory.TestingFramework/Generated/Models/AzureBlobFSReadSettings.Serialization.cs b/src/AzureDataFactory.TestingFramework/Generated/Models/AzureBlobFSReadSettings.Serialization.cs
index 6b859fb2..55c1c55a 100644
--- a/src/AzureDataFactory.TestingFramework/Generated/Models/AzureBlobFSReadSettings.Serialization.cs
+++ b/src/AzureDataFactory.TestingFramework/Generated/Models/AzureBlobFSReadSettings.Serialization.cs
@@ -103,8 +103,8 @@ internal static AzureBlobFSReadSettings DeserializeAzureBlobFSReadSettings(JsonE
             string type = default;
             Optional<DataFactoryElement<int>> maxConcurrentConnections = default;
             Optional<DataFactoryElement<bool>> disableMetricsCollection = default;
-            IDictionary<string, BinaryData> additionalProperties = default;
-            Dictionary<string, BinaryData> additionalPropertiesDictionary = new Dictionary<string, BinaryData>();
+            IDictionary<string, DataFactoryElement<string>> additionalProperties = default;
+            Dictionary<string, DataFactoryElement<string>> additionalPropertiesDictionary = new Dictionary<string, DataFactoryElement<string>>();
             foreach (var property in element.EnumerateObject())
             {
                 if (property.NameEquals("recursive"u8))
@@ -211,7 +211,7 @@ internal static AzureBlobFSReadSettings DeserializeAzureBlobFSReadSettings(JsonE
                     disableMetricsCollection = JsonSerializer.Deserialize<DataFactoryElement<bool>>(property.Value.GetRawText());
                     continue;
                 }
-                additionalPropertiesDictionary.Add(property.Name, BinaryData.FromString(property.Value.GetRawText()));
+                additionalPropertiesDictionary.Add(property.Name, JsonSerializer.Deserialize<DataFactoryElement<string>>(property.Value.GetRawText()));
             }
             additionalProperties = additionalPropertiesDictionary;
             return new AzureBlobFSReadSettings(type, maxConcurrentConnections.Value, disableMetricsCollection.Value, additionalProperties, recursive.Value, wildcardFolderPath.Value, wildcardFileName.Value, fileListPath.Value, enablePartitionDiscovery.Value, partitionRootPath.Value, deleteFilesAfterCompletion.Value, modifiedDatetimeStart.Value, modifiedDatetimeEnd.Value);
diff --git a/src/AzureDataFactory.TestingFramework/Generated/Models/AzureBlobFSReadSettings.cs b/src/AzureDataFactory.TestingFramework/Generated/Models/AzureBlobFSReadSettings.cs
index c6a36ddc..15daafac 100644
--- a/src/AzureDataFactory.TestingFramework/Generated/Models/AzureBlobFSReadSettings.cs
+++ b/src/AzureDataFactory.TestingFramework/Generated/Models/AzureBlobFSReadSettings.cs
@@ -32,7 +32,7 @@ public AzureBlobFSReadSettings()
         /// <param name="deleteFilesAfterCompletion"> Indicates whether the source files need to be deleted after copy completion. Default is false. Type: boolean (or Expression with resultType boolean). </param>
         /// <param name="modifiedDatetimeStart"> The start of file's modified datetime. Type: string (or Expression with resultType string). </param>
         /// <param name="modifiedDatetimeEnd"> The end of file's modified datetime. Type: string (or Expression with resultType string). </param>
-        internal AzureBlobFSReadSettings(string storeReadSettingsType, DataFactoryElement<int> maxConcurrentConnections, DataFactoryElement<bool> disableMetricsCollection, IDictionary<string, BinaryData> additionalProperties, DataFactoryElement<bool> recursive, DataFactoryElement<string> wildcardFolderPath, DataFactoryElement<string> wildcardFileName, DataFactoryElement<string> fileListPath, DataFactoryElement<bool> enablePartitionDiscovery, DataFactoryElement<string> partitionRootPath, DataFactoryElement<bool> deleteFilesAfterCompletion, DataFactoryElement<string> modifiedDatetimeStart, DataFactoryElement<string> modifiedDatetimeEnd) : base(storeReadSettingsType, maxConcurrentConnections, disableMetricsCollection, additionalProperties)
+        internal AzureBlobFSReadSettings(string storeReadSettingsType, DataFactoryElement<int> maxConcurrentConnections, DataFactoryElement<bool> disableMetricsCollection, IDictionary<string, DataFactoryElement<string>> additionalProperties, DataFactoryElement<bool> recursive, DataFactoryElement<string> wildcardFolderPath, DataFactoryElement<string> wildcardFileName, DataFactoryElement<string> fileListPath, DataFactoryElement<bool> enablePartitionDiscovery, DataFactoryElement<string> partitionRootPath, DataFactoryElement<bool> deleteFilesAfterCompletion, DataFactoryElement<string> modifiedDatetimeStart, DataFactoryElement<string> modifiedDatetimeEnd) : base(storeReadSettingsType, maxConcurrentConnections, disableMetricsCollection, additionalProperties)
         {
             Recursive = recursive;
             WildcardFolderPath = wildcardFolderPath;
diff --git a/src/AzureDataFactory.TestingFramework/Generated/Models/AzureBlobFSSink.Serialization.cs b/src/AzureDataFactory.TestingFramework/Generated/Models/AzureBlobFSSink.Serialization.cs
index a010686c..06d4c8c2 100644
--- a/src/AzureDataFactory.TestingFramework/Generated/Models/AzureBlobFSSink.Serialization.cs
+++ b/src/AzureDataFactory.TestingFramework/Generated/Models/AzureBlobFSSink.Serialization.cs
@@ -90,8 +90,8 @@ internal static AzureBlobFSSink DeserializeAzureBlobFSSink(JsonElement element)
             Optional<DataFactoryElement<string>> sinkRetryWait = default;
             Optional<DataFactoryElement<int>> maxConcurrentConnections = default;
             Optional<DataFactoryElement<bool>> disableMetricsCollection = default;
-            IDictionary<string, BinaryData> additionalProperties = default;
-            Dictionary<string, BinaryData> additionalPropertiesDictionary = new Dictionary<string, BinaryData>();
+            IDictionary<string, DataFactoryElement<string>> additionalProperties = default;
+            Dictionary<string, DataFactoryElement<string>> additionalPropertiesDictionary = new Dictionary<string, DataFactoryElement<string>>();
             foreach (var property in element.EnumerateObject())
             {
                 if (property.NameEquals("copyBehavior"u8))
@@ -176,7 +176,7 @@ internal static AzureBlobFSSink DeserializeAzureBlobFSSink(JsonElement element)
                     disableMetricsCollection = JsonSerializer.Deserialize<DataFactoryElement<bool>>(property.Value.GetRawText());
                     continue;
                 }
-                additionalPropertiesDictionary.Add(property.Name, BinaryData.FromString(property.Value.GetRawText()));
+                additionalPropertiesDictionary.Add(property.Name, JsonSerializer.Deserialize<DataFactoryElement<string>>(property.Value.GetRawText()));
             }
             additionalProperties = additionalPropertiesDictionary;
             return new AzureBlobFSSink(type, writeBatchSize.Value, writeBatchTimeout.Value, sinkRetryCount.Value, sinkRetryWait.Value, maxConcurrentConnections.Value, disableMetricsCollection.Value, additionalProperties, copyBehavior.Value, Optional.ToList(metadata));
diff --git a/src/AzureDataFactory.TestingFramework/Generated/Models/AzureBlobFSSink.cs b/src/AzureDataFactory.TestingFramework/Generated/Models/AzureBlobFSSink.cs
index 68fb17d1..c275d9f1 100644
--- a/src/AzureDataFactory.TestingFramework/Generated/Models/AzureBlobFSSink.cs
+++ b/src/AzureDataFactory.TestingFramework/Generated/Models/AzureBlobFSSink.cs
@@ -31,7 +31,7 @@ public AzureBlobFSSink()
         /// <param name="additionalProperties"> Additional Properties. </param>
         /// <param name="copyBehavior"> The type of copy behavior for copy sink. Type: string (or Expression with resultType string). </param>
         /// <param name="metadata"> Specify the custom metadata to be added to sink data. Type: array of objects (or Expression with resultType array of objects). </param>
-        internal AzureBlobFSSink(string copySinkType, DataFactoryElement<int> writeBatchSize, DataFactoryElement<string> writeBatchTimeout, DataFactoryElement<int> sinkRetryCount, DataFactoryElement<string> sinkRetryWait, DataFactoryElement<int> maxConcurrentConnections, DataFactoryElement<bool> disableMetricsCollection, IDictionary<string, BinaryData> additionalProperties, DataFactoryElement<string> copyBehavior, IList<DataFactoryMetadataItemInfo> metadata) : base(copySinkType, writeBatchSize, writeBatchTimeout, sinkRetryCount, sinkRetryWait, maxConcurrentConnections, disableMetricsCollection, additionalProperties)
+        internal AzureBlobFSSink(string copySinkType, DataFactoryElement<int> writeBatchSize, DataFactoryElement<string> writeBatchTimeout, DataFactoryElement<int> sinkRetryCount, DataFactoryElement<string> sinkRetryWait, DataFactoryElement<int> maxConcurrentConnections, DataFactoryElement<bool> disableMetricsCollection, IDictionary<string, DataFactoryElement<string>> additionalProperties, DataFactoryElement<string> copyBehavior, IList<DataFactoryMetadataItemInfo> metadata) : base(copySinkType, writeBatchSize, writeBatchTimeout, sinkRetryCount, sinkRetryWait, maxConcurrentConnections, disableMetricsCollection, additionalProperties)
         {
             CopyBehavior = copyBehavior;
             Metadata = metadata;
diff --git a/src/AzureDataFactory.TestingFramework/Generated/Models/AzureBlobFSSource.Serialization.cs b/src/AzureDataFactory.TestingFramework/Generated/Models/AzureBlobFSSource.Serialization.cs
index 1c1d4b1c..4162c9e0 100644
--- a/src/AzureDataFactory.TestingFramework/Generated/Models/AzureBlobFSSource.Serialization.cs
+++ b/src/AzureDataFactory.TestingFramework/Generated/Models/AzureBlobFSSource.Serialization.cs
@@ -79,8 +79,8 @@ internal static AzureBlobFSSource DeserializeAzureBlobFSSource(JsonElement eleme
             Optional<DataFactoryElement<string>> sourceRetryWait = default;
             Optional<DataFactoryElement<int>> maxConcurrentConnections = default;
             Optional<DataFactoryElement<bool>> disableMetricsCollection = default;
-            IDictionary<string, BinaryData> additionalProperties = default;
-            Dictionary<string, BinaryData> additionalPropertiesDictionary = new Dictionary<string, BinaryData>();
+            IDictionary<string, DataFactoryElement<string>> additionalProperties = default;
+            Dictionary<string, DataFactoryElement<string>> additionalPropertiesDictionary = new Dictionary<string, DataFactoryElement<string>>();
             foreach (var property in element.EnumerateObject())
             {
                 if (property.NameEquals("treatEmptyAsNull"u8))
@@ -151,7 +151,7 @@ internal static AzureBlobFSSource DeserializeAzureBlobFSSource(JsonElement eleme
                     disableMetricsCollection = JsonSerializer.Deserialize<DataFactoryElement<bool>>(property.Value.GetRawText());
                     continue;
                 }
-                additionalPropertiesDictionary.Add(property.Name, BinaryData.FromString(property.Value.GetRawText()));
+                additionalPropertiesDictionary.Add(property.Name, JsonSerializer.Deserialize<DataFactoryElement<string>>(property.Value.GetRawText()));
             }
             additionalProperties = additionalPropertiesDictionary;
             return new AzureBlobFSSource(type, sourceRetryCount.Value, sourceRetryWait.Value, maxConcurrentConnections.Value, disableMetricsCollection.Value, additionalProperties, treatEmptyAsNull.Value, skipHeaderLineCount.Value, recursive.Value);
diff --git a/src/AzureDataFactory.TestingFramework/Generated/Models/AzureBlobFSSource.cs b/src/AzureDataFactory.TestingFramework/Generated/Models/AzureBlobFSSource.cs
index 236b5c68..45fc13e3 100644
--- a/src/AzureDataFactory.TestingFramework/Generated/Models/AzureBlobFSSource.cs
+++ b/src/AzureDataFactory.TestingFramework/Generated/Models/AzureBlobFSSource.cs
@@ -28,7 +28,7 @@ public AzureBlobFSSource()
         /// <param name="treatEmptyAsNull"> Treat empty as null. Type: boolean (or Expression with resultType boolean). </param>
         /// <param name="skipHeaderLineCount"> Number of header lines to skip from each blob. Type: integer (or Expression with resultType integer). </param>
         /// <param name="recursive"> If true, files under the folder path will be read recursively. Default is true. Type: boolean (or Expression with resultType boolean). </param>
-        internal AzureBlobFSSource(string copySourceType, DataFactoryElement<int> sourceRetryCount, DataFactoryElement<string> sourceRetryWait, DataFactoryElement<int> maxConcurrentConnections, DataFactoryElement<bool> disableMetricsCollection, IDictionary<string, BinaryData> additionalProperties, DataFactoryElement<bool> treatEmptyAsNull, DataFactoryElement<int> skipHeaderLineCount, DataFactoryElement<bool> recursive) : base(copySourceType, sourceRetryCount, sourceRetryWait, maxConcurrentConnections, disableMetricsCollection, additionalProperties)
+        internal AzureBlobFSSource(string copySourceType, DataFactoryElement<int> sourceRetryCount, DataFactoryElement<string> sourceRetryWait, DataFactoryElement<int> maxConcurrentConnections, DataFactoryElement<bool> disableMetricsCollection, IDictionary<string, DataFactoryElement<string>> additionalProperties, DataFactoryElement<bool> treatEmptyAsNull, DataFactoryElement<int> skipHeaderLineCount, DataFactoryElement<bool> recursive) : base(copySourceType, sourceRetryCount, sourceRetryWait, maxConcurrentConnections, disableMetricsCollection, additionalProperties)
         {
             TreatEmptyAsNull = treatEmptyAsNull;
             SkipHeaderLineCount = skipHeaderLineCount;
diff --git a/src/AzureDataFactory.TestingFramework/Generated/Models/AzureBlobFSWriteSettings.Serialization.cs b/src/AzureDataFactory.TestingFramework/Generated/Models/AzureBlobFSWriteSettings.Serialization.cs
index af4e1afd..ca705827 100644
--- a/src/AzureDataFactory.TestingFramework/Generated/Models/AzureBlobFSWriteSettings.Serialization.cs
+++ b/src/AzureDataFactory.TestingFramework/Generated/Models/AzureBlobFSWriteSettings.Serialization.cs
@@ -65,8 +65,8 @@ internal static AzureBlobFSWriteSettings DeserializeAzureBlobFSWriteSettings(Jso
             Optional<DataFactoryElement<int>> maxConcurrentConnections = default;
             Optional<DataFactoryElement<bool>> disableMetricsCollection = default;
             Optional<BinaryData> copyBehavior = default;
-            IDictionary<string, BinaryData> additionalProperties = default;
-            Dictionary<string, BinaryData> additionalPropertiesDictionary = new Dictionary<string, BinaryData>();
+            IDictionary<string, DataFactoryElement<string>> additionalProperties = default;
+            Dictionary<string, DataFactoryElement<string>> additionalPropertiesDictionary = new Dictionary<string, DataFactoryElement<string>>();
             foreach (var property in element.EnumerateObject())
             {
                 if (property.NameEquals("blockSizeInMB"u8))
@@ -110,7 +110,7 @@ internal static AzureBlobFSWriteSettings DeserializeAzureBlobFSWriteSettings(Jso
                     copyBehavior = BinaryData.FromString(property.Value.GetRawText());
                     continue;
                 }
-                additionalPropertiesDictionary.Add(property.Name, BinaryData.FromString(property.Value.GetRawText()));
+                additionalPropertiesDictionary.Add(property.Name, JsonSerializer.Deserialize<DataFactoryElement<string>>(property.Value.GetRawText()));
             }
             additionalProperties = additionalPropertiesDictionary;
             return new AzureBlobFSWriteSettings(type, maxConcurrentConnections.Value, disableMetricsCollection.Value, copyBehavior.Value, additionalProperties, blockSizeInMB.Value);
diff --git a/src/AzureDataFactory.TestingFramework/Generated/Models/AzureBlobFSWriteSettings.cs b/src/AzureDataFactory.TestingFramework/Generated/Models/AzureBlobFSWriteSettings.cs
index afd9f9e5..5b59de3b 100644
--- a/src/AzureDataFactory.TestingFramework/Generated/Models/AzureBlobFSWriteSettings.cs
+++ b/src/AzureDataFactory.TestingFramework/Generated/Models/AzureBlobFSWriteSettings.cs
@@ -25,7 +25,7 @@ public AzureBlobFSWriteSettings()
         /// <param name="copyBehavior"> The type of copy behavior for copy sink. </param>
         /// <param name="additionalProperties"> Additional Properties. </param>
         /// <param name="blockSizeInMB"> Indicates the block size(MB) when writing data to blob. Type: integer (or Expression with resultType integer). </param>
-        internal AzureBlobFSWriteSettings(string storeWriteSettingsType, DataFactoryElement<int> maxConcurrentConnections, DataFactoryElement<bool> disableMetricsCollection, BinaryData copyBehavior, IDictionary<string, BinaryData> additionalProperties, DataFactoryElement<int> blockSizeInMB) : base(storeWriteSettingsType, maxConcurrentConnections, disableMetricsCollection, copyBehavior, additionalProperties)
+        internal AzureBlobFSWriteSettings(string storeWriteSettingsType, DataFactoryElement<int> maxConcurrentConnections, DataFactoryElement<bool> disableMetricsCollection, BinaryData copyBehavior, IDictionary<string, DataFactoryElement<string>> additionalProperties, DataFactoryElement<int> blockSizeInMB) : base(storeWriteSettingsType, maxConcurrentConnections, disableMetricsCollection, copyBehavior, additionalProperties)
         {
             BlockSizeInMB = blockSizeInMB;
             StoreWriteSettingsType = storeWriteSettingsType ?? "AzureBlobFSWriteSettings";
diff --git a/src/AzureDataFactory.TestingFramework/Generated/Models/AzureBlobStorageLinkedService.Serialization.cs b/src/AzureDataFactory.TestingFramework/Generated/Models/AzureBlobStorageLinkedService.Serialization.cs
index af6a7d5a..6a55887f 100644
--- a/src/AzureDataFactory.TestingFramework/Generated/Models/AzureBlobStorageLinkedService.Serialization.cs
+++ b/src/AzureDataFactory.TestingFramework/Generated/Models/AzureBlobStorageLinkedService.Serialization.cs
@@ -168,8 +168,8 @@ internal static AzureBlobStorageLinkedService DeserializeAzureBlobStorageLinkedS
             Optional<DataFactoryCredentialReference> credential = default;
             Optional<AzureStorageAuthenticationType> authenticationType = default;
             Optional<DataFactoryElement<string>> containerUri = default;
-            IDictionary<string, BinaryData> additionalProperties = default;
-            Dictionary<string, BinaryData> additionalPropertiesDictionary = new Dictionary<string, BinaryData>();
+            IDictionary<string, DataFactoryElement<string>> additionalProperties = default;
+            Dictionary<string, DataFactoryElement<string>> additionalPropertiesDictionary = new Dictionary<string, DataFactoryElement<string>>();
             foreach (var property in element.EnumerateObject())
             {
                 if (property.NameEquals("type"u8))
@@ -360,7 +360,7 @@ internal static AzureBlobStorageLinkedService DeserializeAzureBlobStorageLinkedS
                     }
                     continue;
                 }
-                additionalPropertiesDictionary.Add(property.Name, BinaryData.FromString(property.Value.GetRawText()));
+                additionalPropertiesDictionary.Add(property.Name, JsonSerializer.Deserialize<DataFactoryElement<string>>(property.Value.GetRawText()));
             }
             additionalProperties = additionalPropertiesDictionary;
             return new AzureBlobStorageLinkedService(type, connectVia.Value, description.Value, Optional.ToDictionary(parameters), Optional.ToList(annotations), additionalProperties, connectionString.Value, accountKey, sasUri.Value, sasToken, serviceEndpoint.Value, servicePrincipalId.Value, servicePrincipalKey, tenant.Value, azureCloudType.Value, accountKind.Value, encryptedCredential.Value, credential.Value, Optional.ToNullable(authenticationType), containerUri.Value);
diff --git a/src/AzureDataFactory.TestingFramework/Generated/Models/AzureBlobStorageLinkedService.cs b/src/AzureDataFactory.TestingFramework/Generated/Models/AzureBlobStorageLinkedService.cs
index 534e6e39..78439631 100644
--- a/src/AzureDataFactory.TestingFramework/Generated/Models/AzureBlobStorageLinkedService.cs
+++ b/src/AzureDataFactory.TestingFramework/Generated/Models/AzureBlobStorageLinkedService.cs
@@ -39,7 +39,7 @@ public AzureBlobStorageLinkedService()
         /// <param name="credential"> The credential reference containing authentication information. </param>
         /// <param name="authenticationType"> The type used for authentication. Type: string. </param>
         /// <param name="containerUri"> Container uri of the Azure Blob Storage resource only support for anonymous access. Type: string (or Expression with resultType string). </param>
-        internal AzureBlobStorageLinkedService(string linkedServiceType, IntegrationRuntimeReference connectVia, string description, IDictionary<string, EntityParameterSpecification> parameters, IList<BinaryData> annotations, IDictionary<string, BinaryData> additionalProperties, DataFactoryElement<string> connectionString, DataFactoryKeyVaultSecretReference accountKey, DataFactoryElement<string> sasUri, DataFactoryKeyVaultSecretReference sasToken, DataFactoryElement<string> serviceEndpoint, DataFactoryElement<string> servicePrincipalId, DataFactorySecretBaseDefinition servicePrincipalKey, DataFactoryElement<string> tenant, DataFactoryElement<string> azureCloudType, DataFactoryElement<string> accountKind, string encryptedCredential, DataFactoryCredentialReference credential, AzureStorageAuthenticationType? authenticationType, DataFactoryElement<string> containerUri) : base(linkedServiceType, connectVia, description, parameters, annotations, additionalProperties)
+        internal AzureBlobStorageLinkedService(string linkedServiceType, IntegrationRuntimeReference connectVia, string description, IDictionary<string, EntityParameterSpecification> parameters, IList<BinaryData> annotations, IDictionary<string, DataFactoryElement<string>> additionalProperties, DataFactoryElement<string> connectionString, DataFactoryKeyVaultSecretReference accountKey, DataFactoryElement<string> sasUri, DataFactoryKeyVaultSecretReference sasToken, DataFactoryElement<string> serviceEndpoint, DataFactoryElement<string> servicePrincipalId, DataFactorySecretBaseDefinition servicePrincipalKey, DataFactoryElement<string> tenant, DataFactoryElement<string> azureCloudType, DataFactoryElement<string> accountKind, string encryptedCredential, DataFactoryCredentialReference credential, AzureStorageAuthenticationType? authenticationType, DataFactoryElement<string> containerUri) : base(linkedServiceType, connectVia, description, parameters, annotations, additionalProperties)
         {
             ConnectionString = connectionString;
             AccountKey = accountKey;
diff --git a/src/AzureDataFactory.TestingFramework/Generated/Models/AzureBlobStorageLocation.Serialization.cs b/src/AzureDataFactory.TestingFramework/Generated/Models/AzureBlobStorageLocation.Serialization.cs
index e2c7dabd..705bd893 100644
--- a/src/AzureDataFactory.TestingFramework/Generated/Models/AzureBlobStorageLocation.Serialization.cs
+++ b/src/AzureDataFactory.TestingFramework/Generated/Models/AzureBlobStorageLocation.Serialization.cs
@@ -55,8 +55,8 @@ internal static AzureBlobStorageLocation DeserializeAzureBlobStorageLocation(Jso
             string type = default;
             Optional<DataFactoryElement<string>> folderPath = default;
             Optional<DataFactoryElement<string>> fileName = default;
-            IDictionary<string, BinaryData> additionalProperties = default;
-            Dictionary<string, BinaryData> additionalPropertiesDictionary = new Dictionary<string, BinaryData>();
+            IDictionary<string, DataFactoryElement<string>> additionalProperties = default;
+            Dictionary<string, DataFactoryElement<string>> additionalPropertiesDictionary = new Dictionary<string, DataFactoryElement<string>>();
             foreach (var property in element.EnumerateObject())
             {
                 if (property.NameEquals("container"u8))
@@ -91,7 +91,7 @@ internal static AzureBlobStorageLocation DeserializeAzureBlobStorageLocation(Jso
                     fileName = JsonSerializer.Deserialize<DataFactoryElement<string>>(property.Value.GetRawText());
                     continue;
                 }
-                additionalPropertiesDictionary.Add(property.Name, BinaryData.FromString(property.Value.GetRawText()));
+                additionalPropertiesDictionary.Add(property.Name, JsonSerializer.Deserialize<DataFactoryElement<string>>(property.Value.GetRawText()));
             }
             additionalProperties = additionalPropertiesDictionary;
             return new AzureBlobStorageLocation(type, folderPath.Value, fileName.Value, additionalProperties, container.Value);
diff --git a/src/AzureDataFactory.TestingFramework/Generated/Models/AzureBlobStorageLocation.cs b/src/AzureDataFactory.TestingFramework/Generated/Models/AzureBlobStorageLocation.cs
index bb1a68f1..bf60a3a1 100644
--- a/src/AzureDataFactory.TestingFramework/Generated/Models/AzureBlobStorageLocation.cs
+++ b/src/AzureDataFactory.TestingFramework/Generated/Models/AzureBlobStorageLocation.cs
@@ -24,7 +24,7 @@ public AzureBlobStorageLocation()
         /// <param name="fileName"> Specify the file name of dataset. Type: string (or Expression with resultType string). </param>
         /// <param name="additionalProperties"> Additional Properties. </param>
         /// <param name="container"> Specify the container of azure blob. Type: string (or Expression with resultType string). </param>
-        internal AzureBlobStorageLocation(string datasetLocationType, DataFactoryElement<string> folderPath, DataFactoryElement<string> fileName, IDictionary<string, BinaryData> additionalProperties, DataFactoryElement<string> container) : base(datasetLocationType, folderPath, fileName, additionalProperties)
+        internal AzureBlobStorageLocation(string datasetLocationType, DataFactoryElement<string> folderPath, DataFactoryElement<string> fileName, IDictionary<string, DataFactoryElement<string>> additionalProperties, DataFactoryElement<string> container) : base(datasetLocationType, folderPath, fileName, additionalProperties)
         {
             Container = container;
             DatasetLocationType = datasetLocationType ?? "AzureBlobStorageLocation";
diff --git a/src/AzureDataFactory.TestingFramework/Generated/Models/AzureBlobStorageReadSettings.Serialization.cs b/src/AzureDataFactory.TestingFramework/Generated/Models/AzureBlobStorageReadSettings.Serialization.cs
index 018f1081..f73eee31 100644
--- a/src/AzureDataFactory.TestingFramework/Generated/Models/AzureBlobStorageReadSettings.Serialization.cs
+++ b/src/AzureDataFactory.TestingFramework/Generated/Models/AzureBlobStorageReadSettings.Serialization.cs
@@ -109,8 +109,8 @@ internal static AzureBlobStorageReadSettings DeserializeAzureBlobStorageReadSett
             string type = default;
             Optional<DataFactoryElement<int>> maxConcurrentConnections = default;
             Optional<DataFactoryElement<bool>> disableMetricsCollection = default;
-            IDictionary<string, BinaryData> additionalProperties = default;
-            Dictionary<string, BinaryData> additionalPropertiesDictionary = new Dictionary<string, BinaryData>();
+            IDictionary<string, DataFactoryElement<string>> additionalProperties = default;
+            Dictionary<string, DataFactoryElement<string>> additionalPropertiesDictionary = new Dictionary<string, DataFactoryElement<string>>();
             foreach (var property in element.EnumerateObject())
             {
                 if (property.NameEquals("recursive"u8))
@@ -226,7 +226,7 @@ internal static AzureBlobStorageReadSettings DeserializeAzureBlobStorageReadSett
                     disableMetricsCollection = JsonSerializer.Deserialize<DataFactoryElement<bool>>(property.Value.GetRawText());
                     continue;
                 }
-                additionalPropertiesDictionary.Add(property.Name, BinaryData.FromString(property.Value.GetRawText()));
+                additionalPropertiesDictionary.Add(property.Name, JsonSerializer.Deserialize<DataFactoryElement<string>>(property.Value.GetRawText()));
             }
             additionalProperties = additionalPropertiesDictionary;
             return new AzureBlobStorageReadSettings(type, maxConcurrentConnections.Value, disableMetricsCollection.Value, additionalProperties, recursive.Value, wildcardFolderPath.Value, wildcardFileName.Value, prefix.Value, fileListPath.Value, enablePartitionDiscovery.Value, partitionRootPath.Value, deleteFilesAfterCompletion.Value, modifiedDatetimeStart.Value, modifiedDatetimeEnd.Value);
diff --git a/src/AzureDataFactory.TestingFramework/Generated/Models/AzureBlobStorageReadSettings.cs b/src/AzureDataFactory.TestingFramework/Generated/Models/AzureBlobStorageReadSettings.cs
index 2e4c934b..a295b1f8 100644
--- a/src/AzureDataFactory.TestingFramework/Generated/Models/AzureBlobStorageReadSettings.cs
+++ b/src/AzureDataFactory.TestingFramework/Generated/Models/AzureBlobStorageReadSettings.cs
@@ -33,7 +33,7 @@ public AzureBlobStorageReadSettings()
         /// <param name="deleteFilesAfterCompletion"> Indicates whether the source files need to be deleted after copy completion. Default is false. Type: boolean (or Expression with resultType boolean). </param>
         /// <param name="modifiedDatetimeStart"> The start of file's modified datetime. Type: string (or Expression with resultType string). </param>
         /// <param name="modifiedDatetimeEnd"> The end of file's modified datetime. Type: string (or Expression with resultType string). </param>
-        internal AzureBlobStorageReadSettings(string storeReadSettingsType, DataFactoryElement<int> maxConcurrentConnections, DataFactoryElement<bool> disableMetricsCollection, IDictionary<string, BinaryData> additionalProperties, DataFactoryElement<bool> recursive, DataFactoryElement<string> wildcardFolderPath, DataFactoryElement<string> wildcardFileName, DataFactoryElement<string> prefix, DataFactoryElement<string> fileListPath, DataFactoryElement<bool> enablePartitionDiscovery, DataFactoryElement<string> partitionRootPath, DataFactoryElement<bool> deleteFilesAfterCompletion, DataFactoryElement<string> modifiedDatetimeStart, DataFactoryElement<string> modifiedDatetimeEnd) : base(storeReadSettingsType, maxConcurrentConnections, disableMetricsCollection, additionalProperties)
+        internal AzureBlobStorageReadSettings(string storeReadSettingsType, DataFactoryElement<int> maxConcurrentConnections, DataFactoryElement<bool> disableMetricsCollection, IDictionary<string, DataFactoryElement<string>> additionalProperties, DataFactoryElement<bool> recursive, DataFactoryElement<string> wildcardFolderPath, DataFactoryElement<string> wildcardFileName, DataFactoryElement<string> prefix, DataFactoryElement<string> fileListPath, DataFactoryElement<bool> enablePartitionDiscovery, DataFactoryElement<string> partitionRootPath, DataFactoryElement<bool> deleteFilesAfterCompletion, DataFactoryElement<string> modifiedDatetimeStart, DataFactoryElement<string> modifiedDatetimeEnd) : base(storeReadSettingsType, maxConcurrentConnections, disableMetricsCollection, additionalProperties)
         {
             Recursive = recursive;
             WildcardFolderPath = wildcardFolderPath;
diff --git a/src/AzureDataFactory.TestingFramework/Generated/Models/AzureBlobStorageWriteSettings.Serialization.cs b/src/AzureDataFactory.TestingFramework/Generated/Models/AzureBlobStorageWriteSettings.Serialization.cs
index 92094664..e431d3d4 100644
--- a/src/AzureDataFactory.TestingFramework/Generated/Models/AzureBlobStorageWriteSettings.Serialization.cs
+++ b/src/AzureDataFactory.TestingFramework/Generated/Models/AzureBlobStorageWriteSettings.Serialization.cs
@@ -65,8 +65,8 @@ internal static AzureBlobStorageWriteSettings DeserializeAzureBlobStorageWriteSe
             Optional<DataFactoryElement<int>> maxConcurrentConnections = default;
             Optional<DataFactoryElement<bool>> disableMetricsCollection = default;
             Optional<BinaryData> copyBehavior = default;
-            IDictionary<string, BinaryData> additionalProperties = default;
-            Dictionary<string, BinaryData> additionalPropertiesDictionary = new Dictionary<string, BinaryData>();
+            IDictionary<string, DataFactoryElement<string>> additionalProperties = default;
+            Dictionary<string, DataFactoryElement<string>> additionalPropertiesDictionary = new Dictionary<string, DataFactoryElement<string>>();
             foreach (var property in element.EnumerateObject())
             {
                 if (property.NameEquals("blockSizeInMB"u8))
@@ -110,7 +110,7 @@ internal static AzureBlobStorageWriteSettings DeserializeAzureBlobStorageWriteSe
                     copyBehavior = BinaryData.FromString(property.Value.GetRawText());
                     continue;
                 }
-                additionalPropertiesDictionary.Add(property.Name, BinaryData.FromString(property.Value.GetRawText()));
+                additionalPropertiesDictionary.Add(property.Name, JsonSerializer.Deserialize<DataFactoryElement<string>>(property.Value.GetRawText()));
             }
             additionalProperties = additionalPropertiesDictionary;
             return new AzureBlobStorageWriteSettings(type, maxConcurrentConnections.Value, disableMetricsCollection.Value, copyBehavior.Value, additionalProperties, blockSizeInMB.Value);
diff --git a/src/AzureDataFactory.TestingFramework/Generated/Models/AzureBlobStorageWriteSettings.cs b/src/AzureDataFactory.TestingFramework/Generated/Models/AzureBlobStorageWriteSettings.cs
index 4097d273..a7199892 100644
--- a/src/AzureDataFactory.TestingFramework/Generated/Models/AzureBlobStorageWriteSettings.cs
+++ b/src/AzureDataFactory.TestingFramework/Generated/Models/AzureBlobStorageWriteSettings.cs
@@ -25,7 +25,7 @@ public AzureBlobStorageWriteSettings()
         /// <param name="copyBehavior"> The type of copy behavior for copy sink. </param>
         /// <param name="additionalProperties"> Additional Properties. </param>
         /// <param name="blockSizeInMB"> Indicates the block size(MB) when writing data to blob. Type: integer (or Expression with resultType integer). </param>
-        internal AzureBlobStorageWriteSettings(string storeWriteSettingsType, DataFactoryElement<int> maxConcurrentConnections, DataFactoryElement<bool> disableMetricsCollection, BinaryData copyBehavior, IDictionary<string, BinaryData> additionalProperties, DataFactoryElement<int> blockSizeInMB) : base(storeWriteSettingsType, maxConcurrentConnections, disableMetricsCollection, copyBehavior, additionalProperties)
+        internal AzureBlobStorageWriteSettings(string storeWriteSettingsType, DataFactoryElement<int> maxConcurrentConnections, DataFactoryElement<bool> disableMetricsCollection, BinaryData copyBehavior, IDictionary<string, DataFactoryElement<string>> additionalProperties, DataFactoryElement<int> blockSizeInMB) : base(storeWriteSettingsType, maxConcurrentConnections, disableMetricsCollection, copyBehavior, additionalProperties)
         {
             BlockSizeInMB = blockSizeInMB;
             StoreWriteSettingsType = storeWriteSettingsType ?? "AzureBlobStorageWriteSettings";
diff --git a/src/AzureDataFactory.TestingFramework/Generated/Models/AzureDataExplorerCommandActivity.Serialization.cs b/src/AzureDataFactory.TestingFramework/Generated/Models/AzureDataExplorerCommandActivity.Serialization.cs
index 900ae2d7..44b23183 100644
--- a/src/AzureDataFactory.TestingFramework/Generated/Models/AzureDataExplorerCommandActivity.Serialization.cs
+++ b/src/AzureDataFactory.TestingFramework/Generated/Models/AzureDataExplorerCommandActivity.Serialization.cs
@@ -104,8 +104,8 @@ internal static AzureDataExplorerCommandActivity DeserializeAzureDataExplorerCom
             Optional<IList<PipelineActivityUserProperty>> userProperties = default;
             DataFactoryElement<string> command = default;
             Optional<DataFactoryElement<string>> commandTimeout = default;
-            IDictionary<string, BinaryData> additionalProperties = default;
-            Dictionary<string, BinaryData> additionalPropertiesDictionary = new Dictionary<string, BinaryData>();
+            IDictionary<string, DataFactoryElement<string>> additionalProperties = default;
+            Dictionary<string, DataFactoryElement<string>> additionalPropertiesDictionary = new Dictionary<string, DataFactoryElement<string>>();
             foreach (var property in element.EnumerateObject())
             {
                 if (property.NameEquals("linkedServiceName"u8))
@@ -213,7 +213,7 @@ internal static AzureDataExplorerCommandActivity DeserializeAzureDataExplorerCom
                     }
                     continue;
                 }
-                additionalPropertiesDictionary.Add(property.Name, BinaryData.FromString(property.Value.GetRawText()));
+                additionalPropertiesDictionary.Add(property.Name, JsonSerializer.Deserialize<DataFactoryElement<string>>(property.Value.GetRawText()));
             }
             additionalProperties = additionalPropertiesDictionary;
             return new AzureDataExplorerCommandActivity(name, type, description.Value, Optional.ToNullable(state), Optional.ToNullable(onInactiveMarkAs), Optional.ToList(dependsOn), Optional.ToList(userProperties), additionalProperties, linkedServiceName, policy.Value, command, commandTimeout.Value);
diff --git a/src/AzureDataFactory.TestingFramework/Generated/Models/AzureDataExplorerCommandActivity.cs b/src/AzureDataFactory.TestingFramework/Generated/Models/AzureDataExplorerCommandActivity.cs
index ee1082c8..3f7923d7 100644
--- a/src/AzureDataFactory.TestingFramework/Generated/Models/AzureDataExplorerCommandActivity.cs
+++ b/src/AzureDataFactory.TestingFramework/Generated/Models/AzureDataExplorerCommandActivity.cs
@@ -39,7 +39,7 @@ public AzureDataExplorerCommandActivity(string name, DataFactoryElement<string>
         /// <param name="policy"> Activity policy. </param>
         /// <param name="command"> A control command, according to the Azure Data Explorer command syntax. Type: string (or Expression with resultType string). </param>
         /// <param name="commandTimeout"> Control command timeout. Type: string (or Expression with resultType string), pattern: ((\d+)\.)?(\d\d):(60|([0-5][0-9])):(60|([0-5][0-9]))..). </param>
-        internal AzureDataExplorerCommandActivity(string name, string activityType, string description, PipelineActivityState? state, ActivityOnInactiveMarkAs? onInactiveMarkAs, IList<PipelineActivityDependency> dependsOn, IList<PipelineActivityUserProperty> userProperties, IDictionary<string, BinaryData> additionalProperties, DataFactoryLinkedServiceReference linkedServiceName, PipelineActivityPolicy policy, DataFactoryElement<string> command, DataFactoryElement<string> commandTimeout) : base(name, activityType, description, state, onInactiveMarkAs, dependsOn, userProperties, additionalProperties, linkedServiceName, policy)
+        internal AzureDataExplorerCommandActivity(string name, string activityType, string description, PipelineActivityState? state, ActivityOnInactiveMarkAs? onInactiveMarkAs, IList<PipelineActivityDependency> dependsOn, IList<PipelineActivityUserProperty> userProperties, IDictionary<string, DataFactoryElement<string>> additionalProperties, DataFactoryLinkedServiceReference linkedServiceName, PipelineActivityPolicy policy, DataFactoryElement<string> command, DataFactoryElement<string> commandTimeout) : base(name, activityType, description, state, onInactiveMarkAs, dependsOn, userProperties, additionalProperties, linkedServiceName, policy)
         {
             Command = command;
             CommandTimeout = commandTimeout;
diff --git a/src/AzureDataFactory.TestingFramework/Generated/Models/AzureDataExplorerLinkedService.Serialization.cs b/src/AzureDataFactory.TestingFramework/Generated/Models/AzureDataExplorerLinkedService.Serialization.cs
index 502e3b34..cede0143 100644
--- a/src/AzureDataFactory.TestingFramework/Generated/Models/AzureDataExplorerLinkedService.Serialization.cs
+++ b/src/AzureDataFactory.TestingFramework/Generated/Models/AzureDataExplorerLinkedService.Serialization.cs
@@ -114,8 +114,8 @@ internal static AzureDataExplorerLinkedService DeserializeAzureDataExplorerLinke
             DataFactoryElement<string> database = default;
             Optional<DataFactoryElement<string>> tenant = default;
             Optional<DataFactoryCredentialReference> credential = default;
-            IDictionary<string, BinaryData> additionalProperties = default;
-            Dictionary<string, BinaryData> additionalPropertiesDictionary = new Dictionary<string, BinaryData>();
+            IDictionary<string, DataFactoryElement<string>> additionalProperties = default;
+            Dictionary<string, DataFactoryElement<string>> additionalPropertiesDictionary = new Dictionary<string, DataFactoryElement<string>>();
             foreach (var property in element.EnumerateObject())
             {
                 if (property.NameEquals("type"u8))
@@ -230,7 +230,7 @@ internal static AzureDataExplorerLinkedService DeserializeAzureDataExplorerLinke
                     }
                     continue;
                 }
-                additionalPropertiesDictionary.Add(property.Name, BinaryData.FromString(property.Value.GetRawText()));
+                additionalPropertiesDictionary.Add(property.Name, JsonSerializer.Deserialize<DataFactoryElement<string>>(property.Value.GetRawText()));
             }
             additionalProperties = additionalPropertiesDictionary;
             return new AzureDataExplorerLinkedService(type, connectVia.Value, description.Value, Optional.ToDictionary(parameters), Optional.ToList(annotations), additionalProperties, endpoint, servicePrincipalId.Value, servicePrincipalKey, database, tenant.Value, credential.Value);
diff --git a/src/AzureDataFactory.TestingFramework/Generated/Models/AzureDataExplorerLinkedService.cs b/src/AzureDataFactory.TestingFramework/Generated/Models/AzureDataExplorerLinkedService.cs
index 9987c34e..51cf52ac 100644
--- a/src/AzureDataFactory.TestingFramework/Generated/Models/AzureDataExplorerLinkedService.cs
+++ b/src/AzureDataFactory.TestingFramework/Generated/Models/AzureDataExplorerLinkedService.cs
@@ -40,7 +40,7 @@ public AzureDataExplorerLinkedService(DataFactoryElement<string> endpoint, DataF
         /// <param name="database"> Database name for connection. Type: string (or Expression with resultType string). </param>
         /// <param name="tenant"> The name or ID of the tenant to which the service principal belongs. Type: string (or Expression with resultType string). </param>
         /// <param name="credential"> The credential reference containing authentication information. </param>
-        internal AzureDataExplorerLinkedService(string linkedServiceType, IntegrationRuntimeReference connectVia, string description, IDictionary<string, EntityParameterSpecification> parameters, IList<BinaryData> annotations, IDictionary<string, BinaryData> additionalProperties, DataFactoryElement<string> endpoint, DataFactoryElement<string> servicePrincipalId, DataFactorySecretBaseDefinition servicePrincipalKey, DataFactoryElement<string> database, DataFactoryElement<string> tenant, DataFactoryCredentialReference credential) : base(linkedServiceType, connectVia, description, parameters, annotations, additionalProperties)
+        internal AzureDataExplorerLinkedService(string linkedServiceType, IntegrationRuntimeReference connectVia, string description, IDictionary<string, EntityParameterSpecification> parameters, IList<BinaryData> annotations, IDictionary<string, DataFactoryElement<string>> additionalProperties, DataFactoryElement<string> endpoint, DataFactoryElement<string> servicePrincipalId, DataFactorySecretBaseDefinition servicePrincipalKey, DataFactoryElement<string> database, DataFactoryElement<string> tenant, DataFactoryCredentialReference credential) : base(linkedServiceType, connectVia, description, parameters, annotations, additionalProperties)
         {
             Endpoint = endpoint;
             ServicePrincipalId = servicePrincipalId;
diff --git a/src/AzureDataFactory.TestingFramework/Generated/Models/AzureDataExplorerSink.Serialization.cs b/src/AzureDataFactory.TestingFramework/Generated/Models/AzureDataExplorerSink.Serialization.cs
index 6020cc4a..0041846e 100644
--- a/src/AzureDataFactory.TestingFramework/Generated/Models/AzureDataExplorerSink.Serialization.cs
+++ b/src/AzureDataFactory.TestingFramework/Generated/Models/AzureDataExplorerSink.Serialization.cs
@@ -91,8 +91,8 @@ internal static AzureDataExplorerSink DeserializeAzureDataExplorerSink(JsonEleme
             Optional<DataFactoryElement<string>> sinkRetryWait = default;
             Optional<DataFactoryElement<int>> maxConcurrentConnections = default;
             Optional<DataFactoryElement<bool>> disableMetricsCollection = default;
-            IDictionary<string, BinaryData> additionalProperties = default;
-            Dictionary<string, BinaryData> additionalPropertiesDictionary = new Dictionary<string, BinaryData>();
+            IDictionary<string, DataFactoryElement<string>> additionalProperties = default;
+            Dictionary<string, DataFactoryElement<string>> additionalPropertiesDictionary = new Dictionary<string, DataFactoryElement<string>>();
             foreach (var property in element.EnumerateObject())
             {
                 if (property.NameEquals("ingestionMappingName"u8))
@@ -181,7 +181,7 @@ internal static AzureDataExplorerSink DeserializeAzureDataExplorerSink(JsonEleme
                     disableMetricsCollection = JsonSerializer.Deserialize<DataFactoryElement<bool>>(property.Value.GetRawText());
                     continue;
                 }
-                additionalPropertiesDictionary.Add(property.Name, BinaryData.FromString(property.Value.GetRawText()));
+                additionalPropertiesDictionary.Add(property.Name, JsonSerializer.Deserialize<DataFactoryElement<string>>(property.Value.GetRawText()));
             }
             additionalProperties = additionalPropertiesDictionary;
             return new AzureDataExplorerSink(type, writeBatchSize.Value, writeBatchTimeout.Value, sinkRetryCount.Value, sinkRetryWait.Value, maxConcurrentConnections.Value, disableMetricsCollection.Value, additionalProperties, ingestionMappingName.Value, ingestionMappingAsJson.Value, flushImmediately.Value);
diff --git a/src/AzureDataFactory.TestingFramework/Generated/Models/AzureDataExplorerSink.cs b/src/AzureDataFactory.TestingFramework/Generated/Models/AzureDataExplorerSink.cs
index 81476d0c..a04841b0 100644
--- a/src/AzureDataFactory.TestingFramework/Generated/Models/AzureDataExplorerSink.cs
+++ b/src/AzureDataFactory.TestingFramework/Generated/Models/AzureDataExplorerSink.cs
@@ -30,7 +30,7 @@ public AzureDataExplorerSink()
         /// <param name="ingestionMappingName"> A name of a pre-created csv mapping that was defined on the target Kusto table. Type: string. </param>
         /// <param name="ingestionMappingAsJson"> An explicit column mapping description provided in a json format. Type: string. </param>
         /// <param name="flushImmediately"> If set to true, any aggregation will be skipped. Default is false. Type: boolean. </param>
-        internal AzureDataExplorerSink(string copySinkType, DataFactoryElement<int> writeBatchSize, DataFactoryElement<string> writeBatchTimeout, DataFactoryElement<int> sinkRetryCount, DataFactoryElement<string> sinkRetryWait, DataFactoryElement<int> maxConcurrentConnections, DataFactoryElement<bool> disableMetricsCollection, IDictionary<string, BinaryData> additionalProperties, DataFactoryElement<string> ingestionMappingName, DataFactoryElement<string> ingestionMappingAsJson, DataFactoryElement<bool> flushImmediately) : base(copySinkType, writeBatchSize, writeBatchTimeout, sinkRetryCount, sinkRetryWait, maxConcurrentConnections, disableMetricsCollection, additionalProperties)
+        internal AzureDataExplorerSink(string copySinkType, DataFactoryElement<int> writeBatchSize, DataFactoryElement<string> writeBatchTimeout, DataFactoryElement<int> sinkRetryCount, DataFactoryElement<string> sinkRetryWait, DataFactoryElement<int> maxConcurrentConnections, DataFactoryElement<bool> disableMetricsCollection, IDictionary<string, DataFactoryElement<string>> additionalProperties, DataFactoryElement<string> ingestionMappingName, DataFactoryElement<string> ingestionMappingAsJson, DataFactoryElement<bool> flushImmediately) : base(copySinkType, writeBatchSize, writeBatchTimeout, sinkRetryCount, sinkRetryWait, maxConcurrentConnections, disableMetricsCollection, additionalProperties)
         {
             IngestionMappingName = ingestionMappingName;
             IngestionMappingAsJson = ingestionMappingAsJson;
diff --git a/src/AzureDataFactory.TestingFramework/Generated/Models/AzureDataExplorerSource.Serialization.cs b/src/AzureDataFactory.TestingFramework/Generated/Models/AzureDataExplorerSource.Serialization.cs
index ce544f27..be56c8ed 100644
--- a/src/AzureDataFactory.TestingFramework/Generated/Models/AzureDataExplorerSource.Serialization.cs
+++ b/src/AzureDataFactory.TestingFramework/Generated/Models/AzureDataExplorerSource.Serialization.cs
@@ -90,8 +90,8 @@ internal static AzureDataExplorerSource DeserializeAzureDataExplorerSource(JsonE
             Optional<DataFactoryElement<string>> sourceRetryWait = default;
             Optional<DataFactoryElement<int>> maxConcurrentConnections = default;
             Optional<DataFactoryElement<bool>> disableMetricsCollection = default;
-            IDictionary<string, BinaryData> additionalProperties = default;
-            Dictionary<string, BinaryData> additionalPropertiesDictionary = new Dictionary<string, BinaryData>();
+            IDictionary<string, DataFactoryElement<string>> additionalProperties = default;
+            Dictionary<string, DataFactoryElement<string>> additionalPropertiesDictionary = new Dictionary<string, DataFactoryElement<string>>();
             foreach (var property in element.EnumerateObject())
             {
                 if (property.NameEquals("query"u8))
@@ -167,7 +167,7 @@ internal static AzureDataExplorerSource DeserializeAzureDataExplorerSource(JsonE
                     disableMetricsCollection = JsonSerializer.Deserialize<DataFactoryElement<bool>>(property.Value.GetRawText());
                     continue;
                 }
-                additionalPropertiesDictionary.Add(property.Name, BinaryData.FromString(property.Value.GetRawText()));
+                additionalPropertiesDictionary.Add(property.Name, JsonSerializer.Deserialize<DataFactoryElement<string>>(property.Value.GetRawText()));
             }
             additionalProperties = additionalPropertiesDictionary;
             return new AzureDataExplorerSource(type, sourceRetryCount.Value, sourceRetryWait.Value, maxConcurrentConnections.Value, disableMetricsCollection.Value, additionalProperties, query, noTruncation.Value, queryTimeout.Value, additionalColumns.Value);
diff --git a/src/AzureDataFactory.TestingFramework/Generated/Models/AzureDataExplorerSource.cs b/src/AzureDataFactory.TestingFramework/Generated/Models/AzureDataExplorerSource.cs
index 6e822965..442633fb 100644
--- a/src/AzureDataFactory.TestingFramework/Generated/Models/AzureDataExplorerSource.cs
+++ b/src/AzureDataFactory.TestingFramework/Generated/Models/AzureDataExplorerSource.cs
@@ -35,7 +35,7 @@ public AzureDataExplorerSource(DataFactoryElement<string> query)
         /// <param name="noTruncation"> The name of the Boolean option that controls whether truncation is applied to result-sets that go beyond a certain row-count limit. </param>
         /// <param name="queryTimeout"> Query timeout. Type: string (or Expression with resultType string), pattern: ((\d+)\.)?(\d\d):(60|([0-5][0-9])):(60|([0-5][0-9])).. </param>
         /// <param name="additionalColumns"> Specifies the additional columns to be added to source data. Type: array of objects(AdditionalColumns) (or Expression with resultType array of objects). </param>
-        internal AzureDataExplorerSource(string copySourceType, DataFactoryElement<int> sourceRetryCount, DataFactoryElement<string> sourceRetryWait, DataFactoryElement<int> maxConcurrentConnections, DataFactoryElement<bool> disableMetricsCollection, IDictionary<string, BinaryData> additionalProperties, DataFactoryElement<string> query, BinaryData noTruncation, DataFactoryElement<string> queryTimeout, BinaryData additionalColumns) : base(copySourceType, sourceRetryCount, sourceRetryWait, maxConcurrentConnections, disableMetricsCollection, additionalProperties)
+        internal AzureDataExplorerSource(string copySourceType, DataFactoryElement<int> sourceRetryCount, DataFactoryElement<string> sourceRetryWait, DataFactoryElement<int> maxConcurrentConnections, DataFactoryElement<bool> disableMetricsCollection, IDictionary<string, DataFactoryElement<string>> additionalProperties, DataFactoryElement<string> query, BinaryData noTruncation, DataFactoryElement<string> queryTimeout, BinaryData additionalColumns) : base(copySourceType, sourceRetryCount, sourceRetryWait, maxConcurrentConnections, disableMetricsCollection, additionalProperties)
         {
             Query = query;
             NoTruncation = noTruncation;
diff --git a/src/AzureDataFactory.TestingFramework/Generated/Models/AzureDataExplorerTableDataset.Serialization.cs b/src/AzureDataFactory.TestingFramework/Generated/Models/AzureDataExplorerTableDataset.Serialization.cs
index 3cc52a59..20688094 100644
--- a/src/AzureDataFactory.TestingFramework/Generated/Models/AzureDataExplorerTableDataset.Serialization.cs
+++ b/src/AzureDataFactory.TestingFramework/Generated/Models/AzureDataExplorerTableDataset.Serialization.cs
@@ -104,8 +104,8 @@ internal static AzureDataExplorerTableDataset DeserializeAzureDataExplorerTableD
             Optional<IList<BinaryData>> annotations = default;
             Optional<DatasetFolder> folder = default;
             Optional<DataFactoryElement<string>> table = default;
-            IDictionary<string, BinaryData> additionalProperties = default;
-            Dictionary<string, BinaryData> additionalPropertiesDictionary = new Dictionary<string, BinaryData>();
+            IDictionary<string, DataFactoryElement<string>> additionalProperties = default;
+            Dictionary<string, DataFactoryElement<string>> additionalPropertiesDictionary = new Dictionary<string, DataFactoryElement<string>>();
             foreach (var property in element.EnumerateObject())
             {
                 if (property.NameEquals("type"u8))
@@ -206,7 +206,7 @@ internal static AzureDataExplorerTableDataset DeserializeAzureDataExplorerTableD
                     }
                     continue;
                 }
-                additionalPropertiesDictionary.Add(property.Name, BinaryData.FromString(property.Value.GetRawText()));
+                additionalPropertiesDictionary.Add(property.Name, JsonSerializer.Deserialize<DataFactoryElement<string>>(property.Value.GetRawText()));
             }
             additionalProperties = additionalPropertiesDictionary;
             return new AzureDataExplorerTableDataset(type, description.Value, structure.Value, schema.Value, linkedServiceName, Optional.ToDictionary(parameters), Optional.ToList(annotations), folder.Value, additionalProperties, table.Value);
diff --git a/src/AzureDataFactory.TestingFramework/Generated/Models/AzureDataExplorerTableDataset.cs b/src/AzureDataFactory.TestingFramework/Generated/Models/AzureDataExplorerTableDataset.cs
index 4f13a839..60ecb898 100644
--- a/src/AzureDataFactory.TestingFramework/Generated/Models/AzureDataExplorerTableDataset.cs
+++ b/src/AzureDataFactory.TestingFramework/Generated/Models/AzureDataExplorerTableDataset.cs
@@ -34,7 +34,7 @@ public AzureDataExplorerTableDataset(DataFactoryLinkedServiceReference linkedSer
         /// <param name="folder"> The folder that this Dataset is in. If not specified, Dataset will appear at the root level. </param>
         /// <param name="additionalProperties"> Additional Properties. </param>
         /// <param name="table"> The table name of the Azure Data Explorer database. Type: string (or Expression with resultType string). </param>
-        internal AzureDataExplorerTableDataset(string datasetType, string description, DataFactoryElement<IList<DatasetDataElement>> structure, DataFactoryElement<IList<DatasetSchemaDataElement>> schema, DataFactoryLinkedServiceReference linkedServiceName, IDictionary<string, EntityParameterSpecification> parameters, IList<BinaryData> annotations, DatasetFolder folder, IDictionary<string, BinaryData> additionalProperties, DataFactoryElement<string> table) : base(datasetType, description, structure, schema, linkedServiceName, parameters, annotations, folder, additionalProperties)
+        internal AzureDataExplorerTableDataset(string datasetType, string description, DataFactoryElement<IList<DatasetDataElement>> structure, DataFactoryElement<IList<DatasetSchemaDataElement>> schema, DataFactoryLinkedServiceReference linkedServiceName, IDictionary<string, EntityParameterSpecification> parameters, IList<BinaryData> annotations, DatasetFolder folder, IDictionary<string, DataFactoryElement<string>> additionalProperties, DataFactoryElement<string> table) : base(datasetType, description, structure, schema, linkedServiceName, parameters, annotations, folder, additionalProperties)
         {
             Table = table;
             DatasetType = datasetType ?? "AzureDataExplorerTable";
diff --git a/src/AzureDataFactory.TestingFramework/Generated/Models/AzureDataLakeAnalyticsLinkedService.Serialization.cs b/src/AzureDataFactory.TestingFramework/Generated/Models/AzureDataLakeAnalyticsLinkedService.Serialization.cs
index 7432646d..3fbab904 100644
--- a/src/AzureDataFactory.TestingFramework/Generated/Models/AzureDataLakeAnalyticsLinkedService.Serialization.cs
+++ b/src/AzureDataFactory.TestingFramework/Generated/Models/AzureDataLakeAnalyticsLinkedService.Serialization.cs
@@ -126,8 +126,8 @@ internal static AzureDataLakeAnalyticsLinkedService DeserializeAzureDataLakeAnal
             Optional<DataFactoryElement<string>> resourceGroupName = default;
             Optional<DataFactoryElement<string>> dataLakeAnalyticsUri = default;
             Optional<string> encryptedCredential = default;
-            IDictionary<string, BinaryData> additionalProperties = default;
-            Dictionary<string, BinaryData> additionalPropertiesDictionary = new Dictionary<string, BinaryData>();
+            IDictionary<string, DataFactoryElement<string>> additionalProperties = default;
+            Dictionary<string, DataFactoryElement<string>> additionalPropertiesDictionary = new Dictionary<string, DataFactoryElement<string>>();
             foreach (var property in element.EnumerateObject())
             {
                 if (property.NameEquals("type"u8))
@@ -256,7 +256,7 @@ internal static AzureDataLakeAnalyticsLinkedService DeserializeAzureDataLakeAnal
                     }
                     continue;
                 }
-                additionalPropertiesDictionary.Add(property.Name, BinaryData.FromString(property.Value.GetRawText()));
+                additionalPropertiesDictionary.Add(property.Name, JsonSerializer.Deserialize<DataFactoryElement<string>>(property.Value.GetRawText()));
             }
             additionalProperties = additionalPropertiesDictionary;
             return new AzureDataLakeAnalyticsLinkedService(type, connectVia.Value, description.Value, Optional.ToDictionary(parameters), Optional.ToList(annotations), additionalProperties, accountName, servicePrincipalId.Value, servicePrincipalKey, tenant, subscriptionId.Value, resourceGroupName.Value, dataLakeAnalyticsUri.Value, encryptedCredential.Value);
diff --git a/src/AzureDataFactory.TestingFramework/Generated/Models/AzureDataLakeAnalyticsLinkedService.cs b/src/AzureDataFactory.TestingFramework/Generated/Models/AzureDataLakeAnalyticsLinkedService.cs
index ec96097e..222c32c6 100644
--- a/src/AzureDataFactory.TestingFramework/Generated/Models/AzureDataLakeAnalyticsLinkedService.cs
+++ b/src/AzureDataFactory.TestingFramework/Generated/Models/AzureDataLakeAnalyticsLinkedService.cs
@@ -42,7 +42,7 @@ public AzureDataLakeAnalyticsLinkedService(DataFactoryElement<string> accountNam
         /// <param name="resourceGroupName"> Data Lake Analytics account resource group name (if different from Data Factory account). Type: string (or Expression with resultType string). </param>
         /// <param name="dataLakeAnalyticsUri"> Azure Data Lake Analytics URI Type: string (or Expression with resultType string). </param>
         /// <param name="encryptedCredential"> The encrypted credential used for authentication. Credentials are encrypted using the integration runtime credential manager. Type: string. </param>
-        internal AzureDataLakeAnalyticsLinkedService(string linkedServiceType, IntegrationRuntimeReference connectVia, string description, IDictionary<string, EntityParameterSpecification> parameters, IList<BinaryData> annotations, IDictionary<string, BinaryData> additionalProperties, DataFactoryElement<string> accountName, DataFactoryElement<string> servicePrincipalId, DataFactorySecretBaseDefinition servicePrincipalKey, DataFactoryElement<string> tenant, DataFactoryElement<string> subscriptionId, DataFactoryElement<string> resourceGroupName, DataFactoryElement<string> dataLakeAnalyticsUri, string encryptedCredential) : base(linkedServiceType, connectVia, description, parameters, annotations, additionalProperties)
+        internal AzureDataLakeAnalyticsLinkedService(string linkedServiceType, IntegrationRuntimeReference connectVia, string description, IDictionary<string, EntityParameterSpecification> parameters, IList<BinaryData> annotations, IDictionary<string, DataFactoryElement<string>> additionalProperties, DataFactoryElement<string> accountName, DataFactoryElement<string> servicePrincipalId, DataFactorySecretBaseDefinition servicePrincipalKey, DataFactoryElement<string> tenant, DataFactoryElement<string> subscriptionId, DataFactoryElement<string> resourceGroupName, DataFactoryElement<string> dataLakeAnalyticsUri, string encryptedCredential) : base(linkedServiceType, connectVia, description, parameters, annotations, additionalProperties)
         {
             AccountName = accountName;
             ServicePrincipalId = servicePrincipalId;
diff --git a/src/AzureDataFactory.TestingFramework/Generated/Models/AzureDataLakeStoreDataset.Serialization.cs b/src/AzureDataFactory.TestingFramework/Generated/Models/AzureDataLakeStoreDataset.Serialization.cs
index 578bace9..0fe2eb17 100644
--- a/src/AzureDataFactory.TestingFramework/Generated/Models/AzureDataLakeStoreDataset.Serialization.cs
+++ b/src/AzureDataFactory.TestingFramework/Generated/Models/AzureDataLakeStoreDataset.Serialization.cs
@@ -122,8 +122,8 @@ internal static AzureDataLakeStoreDataset DeserializeAzureDataLakeStoreDataset(J
             Optional<DataFactoryElement<string>> fileName = default;
             Optional<DatasetStorageFormat> format = default;
             Optional<DatasetCompression> compression = default;
-            IDictionary<string, BinaryData> additionalProperties = default;
-            Dictionary<string, BinaryData> additionalPropertiesDictionary = new Dictionary<string, BinaryData>();
+            IDictionary<string, DataFactoryElement<string>> additionalProperties = default;
+            Dictionary<string, DataFactoryElement<string>> additionalPropertiesDictionary = new Dictionary<string, DataFactoryElement<string>>();
             foreach (var property in element.EnumerateObject())
             {
                 if (property.NameEquals("type"u8))
@@ -251,7 +251,7 @@ internal static AzureDataLakeStoreDataset DeserializeAzureDataLakeStoreDataset(J
                     }
                     continue;
                 }
-                additionalPropertiesDictionary.Add(property.Name, BinaryData.FromString(property.Value.GetRawText()));
+                additionalPropertiesDictionary.Add(property.Name, JsonSerializer.Deserialize<DataFactoryElement<string>>(property.Value.GetRawText()));
             }
             additionalProperties = additionalPropertiesDictionary;
             return new AzureDataLakeStoreDataset(type, description.Value, structure.Value, schema.Value, linkedServiceName, Optional.ToDictionary(parameters), Optional.ToList(annotations), folder.Value, additionalProperties, folderPath.Value, fileName.Value, format.Value, compression.Value);
diff --git a/src/AzureDataFactory.TestingFramework/Generated/Models/AzureDataLakeStoreDataset.cs b/src/AzureDataFactory.TestingFramework/Generated/Models/AzureDataLakeStoreDataset.cs
index 0020e3de..af9f504e 100644
--- a/src/AzureDataFactory.TestingFramework/Generated/Models/AzureDataLakeStoreDataset.cs
+++ b/src/AzureDataFactory.TestingFramework/Generated/Models/AzureDataLakeStoreDataset.cs
@@ -41,7 +41,7 @@ public AzureDataLakeStoreDataset(DataFactoryLinkedServiceReference linkedService
         /// The available derived classes include <see cref="DatasetAvroFormat"/>, <see cref="DatasetJsonFormat"/>, <see cref="DatasetOrcFormat"/>, <see cref="DatasetParquetFormat"/> and <see cref="DatasetTextFormat"/>.
         /// </param>
         /// <param name="compression"> The data compression method used for the item(s) in the Azure Data Lake Store. </param>
-        internal AzureDataLakeStoreDataset(string datasetType, string description, DataFactoryElement<IList<DatasetDataElement>> structure, DataFactoryElement<IList<DatasetSchemaDataElement>> schema, DataFactoryLinkedServiceReference linkedServiceName, IDictionary<string, EntityParameterSpecification> parameters, IList<BinaryData> annotations, DatasetFolder folder, IDictionary<string, BinaryData> additionalProperties, DataFactoryElement<string> folderPath, DataFactoryElement<string> fileName, DatasetStorageFormat format, DatasetCompression compression) : base(datasetType, description, structure, schema, linkedServiceName, parameters, annotations, folder, additionalProperties)
+        internal AzureDataLakeStoreDataset(string datasetType, string description, DataFactoryElement<IList<DatasetDataElement>> structure, DataFactoryElement<IList<DatasetSchemaDataElement>> schema, DataFactoryLinkedServiceReference linkedServiceName, IDictionary<string, EntityParameterSpecification> parameters, IList<BinaryData> annotations, DatasetFolder folder, IDictionary<string, DataFactoryElement<string>> additionalProperties, DataFactoryElement<string> folderPath, DataFactoryElement<string> fileName, DatasetStorageFormat format, DatasetCompression compression) : base(datasetType, description, structure, schema, linkedServiceName, parameters, annotations, folder, additionalProperties)
         {
             FolderPath = folderPath;
             FileName = fileName;
diff --git a/src/AzureDataFactory.TestingFramework/Generated/Models/AzureDataLakeStoreLinkedService.Serialization.cs b/src/AzureDataFactory.TestingFramework/Generated/Models/AzureDataLakeStoreLinkedService.Serialization.cs
index d6e34646..a66b9550 100644
--- a/src/AzureDataFactory.TestingFramework/Generated/Models/AzureDataLakeStoreLinkedService.Serialization.cs
+++ b/src/AzureDataFactory.TestingFramework/Generated/Models/AzureDataLakeStoreLinkedService.Serialization.cs
@@ -141,8 +141,8 @@ internal static AzureDataLakeStoreLinkedService DeserializeAzureDataLakeStoreLin
             Optional<DataFactoryElement<string>> resourceGroupName = default;
             Optional<string> encryptedCredential = default;
             Optional<DataFactoryCredentialReference> credential = default;
-            IDictionary<string, BinaryData> additionalProperties = default;
-            Dictionary<string, BinaryData> additionalPropertiesDictionary = new Dictionary<string, BinaryData>();
+            IDictionary<string, DataFactoryElement<string>> additionalProperties = default;
+            Dictionary<string, DataFactoryElement<string>> additionalPropertiesDictionary = new Dictionary<string, DataFactoryElement<string>>();
             foreach (var property in element.EnumerateObject())
             {
                 if (property.NameEquals("type"u8))
@@ -293,7 +293,7 @@ internal static AzureDataLakeStoreLinkedService DeserializeAzureDataLakeStoreLin
                     }
                     continue;
                 }
-                additionalPropertiesDictionary.Add(property.Name, BinaryData.FromString(property.Value.GetRawText()));
+                additionalPropertiesDictionary.Add(property.Name, JsonSerializer.Deserialize<DataFactoryElement<string>>(property.Value.GetRawText()));
             }
             additionalProperties = additionalPropertiesDictionary;
             return new AzureDataLakeStoreLinkedService(type, connectVia.Value, description.Value, Optional.ToDictionary(parameters), Optional.ToList(annotations), additionalProperties, dataLakeStoreUri, servicePrincipalId.Value, servicePrincipalKey, tenant.Value, azureCloudType.Value, accountName.Value, subscriptionId.Value, resourceGroupName.Value, encryptedCredential.Value, credential.Value);
diff --git a/src/AzureDataFactory.TestingFramework/Generated/Models/AzureDataLakeStoreLinkedService.cs b/src/AzureDataFactory.TestingFramework/Generated/Models/AzureDataLakeStoreLinkedService.cs
index 92e8af8b..bda5b792 100644
--- a/src/AzureDataFactory.TestingFramework/Generated/Models/AzureDataLakeStoreLinkedService.cs
+++ b/src/AzureDataFactory.TestingFramework/Generated/Models/AzureDataLakeStoreLinkedService.cs
@@ -41,7 +41,7 @@ public AzureDataLakeStoreLinkedService(DataFactoryElement<string> dataLakeStoreU
         /// <param name="resourceGroupName"> Data Lake Store account resource group name (if different from Data Factory account). Type: string (or Expression with resultType string). </param>
         /// <param name="encryptedCredential"> The encrypted credential used for authentication. Credentials are encrypted using the integration runtime credential manager. Type: string. </param>
         /// <param name="credential"> The credential reference containing authentication information. </param>
-        internal AzureDataLakeStoreLinkedService(string linkedServiceType, IntegrationRuntimeReference connectVia, string description, IDictionary<string, EntityParameterSpecification> parameters, IList<BinaryData> annotations, IDictionary<string, BinaryData> additionalProperties, DataFactoryElement<string> dataLakeStoreUri, DataFactoryElement<string> servicePrincipalId, DataFactorySecretBaseDefinition servicePrincipalKey, DataFactoryElement<string> tenant, DataFactoryElement<string> azureCloudType, DataFactoryElement<string> accountName, DataFactoryElement<string> subscriptionId, DataFactoryElement<string> resourceGroupName, string encryptedCredential, DataFactoryCredentialReference credential) : base(linkedServiceType, connectVia, description, parameters, annotations, additionalProperties)
+        internal AzureDataLakeStoreLinkedService(string linkedServiceType, IntegrationRuntimeReference connectVia, string description, IDictionary<string, EntityParameterSpecification> parameters, IList<BinaryData> annotations, IDictionary<string, DataFactoryElement<string>> additionalProperties, DataFactoryElement<string> dataLakeStoreUri, DataFactoryElement<string> servicePrincipalId, DataFactorySecretBaseDefinition servicePrincipalKey, DataFactoryElement<string> tenant, DataFactoryElement<string> azureCloudType, DataFactoryElement<string> accountName, DataFactoryElement<string> subscriptionId, DataFactoryElement<string> resourceGroupName, string encryptedCredential, DataFactoryCredentialReference credential) : base(linkedServiceType, connectVia, description, parameters, annotations, additionalProperties)
         {
             DataLakeStoreUri = dataLakeStoreUri;
             ServicePrincipalId = servicePrincipalId;
diff --git a/src/AzureDataFactory.TestingFramework/Generated/Models/AzureDataLakeStoreLocation.Serialization.cs b/src/AzureDataFactory.TestingFramework/Generated/Models/AzureDataLakeStoreLocation.Serialization.cs
index 6814edd9..a21a8663 100644
--- a/src/AzureDataFactory.TestingFramework/Generated/Models/AzureDataLakeStoreLocation.Serialization.cs
+++ b/src/AzureDataFactory.TestingFramework/Generated/Models/AzureDataLakeStoreLocation.Serialization.cs
@@ -49,8 +49,8 @@ internal static AzureDataLakeStoreLocation DeserializeAzureDataLakeStoreLocation
             string type = default;
             Optional<DataFactoryElement<string>> folderPath = default;
             Optional<DataFactoryElement<string>> fileName = default;
-            IDictionary<string, BinaryData> additionalProperties = default;
-            Dictionary<string, BinaryData> additionalPropertiesDictionary = new Dictionary<string, BinaryData>();
+            IDictionary<string, DataFactoryElement<string>> additionalProperties = default;
+            Dictionary<string, DataFactoryElement<string>> additionalPropertiesDictionary = new Dictionary<string, DataFactoryElement<string>>();
             foreach (var property in element.EnumerateObject())
             {
                 if (property.NameEquals("type"u8))
@@ -76,7 +76,7 @@ internal static AzureDataLakeStoreLocation DeserializeAzureDataLakeStoreLocation
                     fileName = JsonSerializer.Deserialize<DataFactoryElement<string>>(property.Value.GetRawText());
                     continue;
                 }
-                additionalPropertiesDictionary.Add(property.Name, BinaryData.FromString(property.Value.GetRawText()));
+                additionalPropertiesDictionary.Add(property.Name, JsonSerializer.Deserialize<DataFactoryElement<string>>(property.Value.GetRawText()));
             }
             additionalProperties = additionalPropertiesDictionary;
             return new AzureDataLakeStoreLocation(type, folderPath.Value, fileName.Value, additionalProperties);
diff --git a/src/AzureDataFactory.TestingFramework/Generated/Models/AzureDataLakeStoreLocation.cs b/src/AzureDataFactory.TestingFramework/Generated/Models/AzureDataLakeStoreLocation.cs
index 38b495e3..cc362da0 100644
--- a/src/AzureDataFactory.TestingFramework/Generated/Models/AzureDataLakeStoreLocation.cs
+++ b/src/AzureDataFactory.TestingFramework/Generated/Models/AzureDataLakeStoreLocation.cs
@@ -23,7 +23,7 @@ public AzureDataLakeStoreLocation()
         /// <param name="folderPath"> Specify the folder path of dataset. Type: string (or Expression with resultType string). </param>
         /// <param name="fileName"> Specify the file name of dataset. Type: string (or Expression with resultType string). </param>
         /// <param name="additionalProperties"> Additional Properties. </param>
-        internal AzureDataLakeStoreLocation(string datasetLocationType, DataFactoryElement<string> folderPath, DataFactoryElement<string> fileName, IDictionary<string, BinaryData> additionalProperties) : base(datasetLocationType, folderPath, fileName, additionalProperties)
+        internal AzureDataLakeStoreLocation(string datasetLocationType, DataFactoryElement<string> folderPath, DataFactoryElement<string> fileName, IDictionary<string, DataFactoryElement<string>> additionalProperties) : base(datasetLocationType, folderPath, fileName, additionalProperties)
         {
             DatasetLocationType = datasetLocationType ?? "AzureDataLakeStoreLocation";
         }
diff --git a/src/AzureDataFactory.TestingFramework/Generated/Models/AzureDataLakeStoreReadSettings.Serialization.cs b/src/AzureDataFactory.TestingFramework/Generated/Models/AzureDataLakeStoreReadSettings.Serialization.cs
index 42c87f83..50b0d1ed 100644
--- a/src/AzureDataFactory.TestingFramework/Generated/Models/AzureDataLakeStoreReadSettings.Serialization.cs
+++ b/src/AzureDataFactory.TestingFramework/Generated/Models/AzureDataLakeStoreReadSettings.Serialization.cs
@@ -115,8 +115,8 @@ internal static AzureDataLakeStoreReadSettings DeserializeAzureDataLakeStoreRead
             string type = default;
             Optional<DataFactoryElement<int>> maxConcurrentConnections = default;
             Optional<DataFactoryElement<bool>> disableMetricsCollection = default;
-            IDictionary<string, BinaryData> additionalProperties = default;
-            Dictionary<string, BinaryData> additionalPropertiesDictionary = new Dictionary<string, BinaryData>();
+            IDictionary<string, DataFactoryElement<string>> additionalProperties = default;
+            Dictionary<string, DataFactoryElement<string>> additionalPropertiesDictionary = new Dictionary<string, DataFactoryElement<string>>();
             foreach (var property in element.EnumerateObject())
             {
                 if (property.NameEquals("recursive"u8))
@@ -241,7 +241,7 @@ internal static AzureDataLakeStoreReadSettings DeserializeAzureDataLakeStoreRead
                     disableMetricsCollection = JsonSerializer.Deserialize<DataFactoryElement<bool>>(property.Value.GetRawText());
                     continue;
                 }
-                additionalPropertiesDictionary.Add(property.Name, BinaryData.FromString(property.Value.GetRawText()));
+                additionalPropertiesDictionary.Add(property.Name, JsonSerializer.Deserialize<DataFactoryElement<string>>(property.Value.GetRawText()));
             }
             additionalProperties = additionalPropertiesDictionary;
             return new AzureDataLakeStoreReadSettings(type, maxConcurrentConnections.Value, disableMetricsCollection.Value, additionalProperties, recursive.Value, wildcardFolderPath.Value, wildcardFileName.Value, fileListPath.Value, listAfter.Value, listBefore.Value, enablePartitionDiscovery.Value, partitionRootPath.Value, deleteFilesAfterCompletion.Value, modifiedDatetimeStart.Value, modifiedDatetimeEnd.Value);
diff --git a/src/AzureDataFactory.TestingFramework/Generated/Models/AzureDataLakeStoreReadSettings.cs b/src/AzureDataFactory.TestingFramework/Generated/Models/AzureDataLakeStoreReadSettings.cs
index 0a5a2c39..c8a34ce5 100644
--- a/src/AzureDataFactory.TestingFramework/Generated/Models/AzureDataLakeStoreReadSettings.cs
+++ b/src/AzureDataFactory.TestingFramework/Generated/Models/AzureDataLakeStoreReadSettings.cs
@@ -34,7 +34,7 @@ public AzureDataLakeStoreReadSettings()
         /// <param name="deleteFilesAfterCompletion"> Indicates whether the source files need to be deleted after copy completion. Default is false. Type: boolean (or Expression with resultType boolean). </param>
         /// <param name="modifiedDatetimeStart"> The start of file's modified datetime. Type: string (or Expression with resultType string). </param>
         /// <param name="modifiedDatetimeEnd"> The end of file's modified datetime. Type: string (or Expression with resultType string). </param>
-        internal AzureDataLakeStoreReadSettings(string storeReadSettingsType, DataFactoryElement<int> maxConcurrentConnections, DataFactoryElement<bool> disableMetricsCollection, IDictionary<string, BinaryData> additionalProperties, DataFactoryElement<bool> recursive, DataFactoryElement<string> wildcardFolderPath, DataFactoryElement<string> wildcardFileName, DataFactoryElement<string> fileListPath, DataFactoryElement<string> listAfter, DataFactoryElement<string> listBefore, DataFactoryElement<bool> enablePartitionDiscovery, DataFactoryElement<string> partitionRootPath, DataFactoryElement<bool> deleteFilesAfterCompletion, DataFactoryElement<string> modifiedDatetimeStart, DataFactoryElement<string> modifiedDatetimeEnd) : base(storeReadSettingsType, maxConcurrentConnections, disableMetricsCollection, additionalProperties)
+        internal AzureDataLakeStoreReadSettings(string storeReadSettingsType, DataFactoryElement<int> maxConcurrentConnections, DataFactoryElement<bool> disableMetricsCollection, IDictionary<string, DataFactoryElement<string>> additionalProperties, DataFactoryElement<bool> recursive, DataFactoryElement<string> wildcardFolderPath, DataFactoryElement<string> wildcardFileName, DataFactoryElement<string> fileListPath, DataFactoryElement<string> listAfter, DataFactoryElement<string> listBefore, DataFactoryElement<bool> enablePartitionDiscovery, DataFactoryElement<string> partitionRootPath, DataFactoryElement<bool> deleteFilesAfterCompletion, DataFactoryElement<string> modifiedDatetimeStart, DataFactoryElement<string> modifiedDatetimeEnd) : base(storeReadSettingsType, maxConcurrentConnections, disableMetricsCollection, additionalProperties)
         {
             Recursive = recursive;
             WildcardFolderPath = wildcardFolderPath;
diff --git a/src/AzureDataFactory.TestingFramework/Generated/Models/AzureDataLakeStoreSink.Serialization.cs b/src/AzureDataFactory.TestingFramework/Generated/Models/AzureDataLakeStoreSink.Serialization.cs
index d8801959..e2b449f9 100644
--- a/src/AzureDataFactory.TestingFramework/Generated/Models/AzureDataLakeStoreSink.Serialization.cs
+++ b/src/AzureDataFactory.TestingFramework/Generated/Models/AzureDataLakeStoreSink.Serialization.cs
@@ -89,8 +89,8 @@ internal static AzureDataLakeStoreSink DeserializeAzureDataLakeStoreSink(JsonEle
             Optional<DataFactoryElement<string>> sinkRetryWait = default;
             Optional<DataFactoryElement<int>> maxConcurrentConnections = default;
             Optional<DataFactoryElement<bool>> disableMetricsCollection = default;
-            IDictionary<string, BinaryData> additionalProperties = default;
-            Dictionary<string, BinaryData> additionalPropertiesDictionary = new Dictionary<string, BinaryData>();
+            IDictionary<string, DataFactoryElement<string>> additionalProperties = default;
+            Dictionary<string, DataFactoryElement<string>> additionalPropertiesDictionary = new Dictionary<string, DataFactoryElement<string>>();
             foreach (var property in element.EnumerateObject())
             {
                 if (property.NameEquals("copyBehavior"u8))
@@ -170,7 +170,7 @@ internal static AzureDataLakeStoreSink DeserializeAzureDataLakeStoreSink(JsonEle
                     disableMetricsCollection = JsonSerializer.Deserialize<DataFactoryElement<bool>>(property.Value.GetRawText());
                     continue;
                 }
-                additionalPropertiesDictionary.Add(property.Name, BinaryData.FromString(property.Value.GetRawText()));
+                additionalPropertiesDictionary.Add(property.Name, JsonSerializer.Deserialize<DataFactoryElement<string>>(property.Value.GetRawText()));
             }
             additionalProperties = additionalPropertiesDictionary;
             return new AzureDataLakeStoreSink(type, writeBatchSize.Value, writeBatchTimeout.Value, sinkRetryCount.Value, sinkRetryWait.Value, maxConcurrentConnections.Value, disableMetricsCollection.Value, additionalProperties, copyBehavior.Value, enableAdlsSingleFileParallel.Value);
diff --git a/src/AzureDataFactory.TestingFramework/Generated/Models/AzureDataLakeStoreSink.cs b/src/AzureDataFactory.TestingFramework/Generated/Models/AzureDataLakeStoreSink.cs
index 9638245d..4a330b75 100644
--- a/src/AzureDataFactory.TestingFramework/Generated/Models/AzureDataLakeStoreSink.cs
+++ b/src/AzureDataFactory.TestingFramework/Generated/Models/AzureDataLakeStoreSink.cs
@@ -29,7 +29,7 @@ public AzureDataLakeStoreSink()
         /// <param name="additionalProperties"> Additional Properties. </param>
         /// <param name="copyBehavior"> The type of copy behavior for copy sink. Type: string (or Expression with resultType string). </param>
         /// <param name="enableAdlsSingleFileParallel"> Single File Parallel. </param>
-        internal AzureDataLakeStoreSink(string copySinkType, DataFactoryElement<int> writeBatchSize, DataFactoryElement<string> writeBatchTimeout, DataFactoryElement<int> sinkRetryCount, DataFactoryElement<string> sinkRetryWait, DataFactoryElement<int> maxConcurrentConnections, DataFactoryElement<bool> disableMetricsCollection, IDictionary<string, BinaryData> additionalProperties, DataFactoryElement<string> copyBehavior, BinaryData enableAdlsSingleFileParallel) : base(copySinkType, writeBatchSize, writeBatchTimeout, sinkRetryCount, sinkRetryWait, maxConcurrentConnections, disableMetricsCollection, additionalProperties)
+        internal AzureDataLakeStoreSink(string copySinkType, DataFactoryElement<int> writeBatchSize, DataFactoryElement<string> writeBatchTimeout, DataFactoryElement<int> sinkRetryCount, DataFactoryElement<string> sinkRetryWait, DataFactoryElement<int> maxConcurrentConnections, DataFactoryElement<bool> disableMetricsCollection, IDictionary<string, DataFactoryElement<string>> additionalProperties, DataFactoryElement<string> copyBehavior, BinaryData enableAdlsSingleFileParallel) : base(copySinkType, writeBatchSize, writeBatchTimeout, sinkRetryCount, sinkRetryWait, maxConcurrentConnections, disableMetricsCollection, additionalProperties)
         {
             CopyBehavior = copyBehavior;
             EnableAdlsSingleFileParallel = enableAdlsSingleFileParallel;
diff --git a/src/AzureDataFactory.TestingFramework/Generated/Models/AzureDataLakeStoreSource.Serialization.cs b/src/AzureDataFactory.TestingFramework/Generated/Models/AzureDataLakeStoreSource.Serialization.cs
index 1e65e129..05d74f98 100644
--- a/src/AzureDataFactory.TestingFramework/Generated/Models/AzureDataLakeStoreSource.Serialization.cs
+++ b/src/AzureDataFactory.TestingFramework/Generated/Models/AzureDataLakeStoreSource.Serialization.cs
@@ -67,8 +67,8 @@ internal static AzureDataLakeStoreSource DeserializeAzureDataLakeStoreSource(Jso
             Optional<DataFactoryElement<string>> sourceRetryWait = default;
             Optional<DataFactoryElement<int>> maxConcurrentConnections = default;
             Optional<DataFactoryElement<bool>> disableMetricsCollection = default;
-            IDictionary<string, BinaryData> additionalProperties = default;
-            Dictionary<string, BinaryData> additionalPropertiesDictionary = new Dictionary<string, BinaryData>();
+            IDictionary<string, DataFactoryElement<string>> additionalProperties = default;
+            Dictionary<string, DataFactoryElement<string>> additionalPropertiesDictionary = new Dictionary<string, DataFactoryElement<string>>();
             foreach (var property in element.EnumerateObject())
             {
                 if (property.NameEquals("recursive"u8))
@@ -121,7 +121,7 @@ internal static AzureDataLakeStoreSource DeserializeAzureDataLakeStoreSource(Jso
                     disableMetricsCollection = JsonSerializer.Deserialize<DataFactoryElement<bool>>(property.Value.GetRawText());
                     continue;
                 }
-                additionalPropertiesDictionary.Add(property.Name, BinaryData.FromString(property.Value.GetRawText()));
+                additionalPropertiesDictionary.Add(property.Name, JsonSerializer.Deserialize<DataFactoryElement<string>>(property.Value.GetRawText()));
             }
             additionalProperties = additionalPropertiesDictionary;
             return new AzureDataLakeStoreSource(type, sourceRetryCount.Value, sourceRetryWait.Value, maxConcurrentConnections.Value, disableMetricsCollection.Value, additionalProperties, recursive.Value);
diff --git a/src/AzureDataFactory.TestingFramework/Generated/Models/AzureDataLakeStoreSource.cs b/src/AzureDataFactory.TestingFramework/Generated/Models/AzureDataLakeStoreSource.cs
index 820bf81f..b73fd92e 100644
--- a/src/AzureDataFactory.TestingFramework/Generated/Models/AzureDataLakeStoreSource.cs
+++ b/src/AzureDataFactory.TestingFramework/Generated/Models/AzureDataLakeStoreSource.cs
@@ -26,7 +26,7 @@ public AzureDataLakeStoreSource()
         /// <param name="disableMetricsCollection"> If true, disable data store metrics collection. Default is false. Type: boolean (or Expression with resultType boolean). </param>
         /// <param name="additionalProperties"> Additional Properties. </param>
         /// <param name="recursive"> If true, files under the folder path will be read recursively. Default is true. Type: boolean (or Expression with resultType boolean). </param>
-        internal AzureDataLakeStoreSource(string copySourceType, DataFactoryElement<int> sourceRetryCount, DataFactoryElement<string> sourceRetryWait, DataFactoryElement<int> maxConcurrentConnections, DataFactoryElement<bool> disableMetricsCollection, IDictionary<string, BinaryData> additionalProperties, DataFactoryElement<bool> recursive) : base(copySourceType, sourceRetryCount, sourceRetryWait, maxConcurrentConnections, disableMetricsCollection, additionalProperties)
+        internal AzureDataLakeStoreSource(string copySourceType, DataFactoryElement<int> sourceRetryCount, DataFactoryElement<string> sourceRetryWait, DataFactoryElement<int> maxConcurrentConnections, DataFactoryElement<bool> disableMetricsCollection, IDictionary<string, DataFactoryElement<string>> additionalProperties, DataFactoryElement<bool> recursive) : base(copySourceType, sourceRetryCount, sourceRetryWait, maxConcurrentConnections, disableMetricsCollection, additionalProperties)
         {
             Recursive = recursive;
             CopySourceType = copySourceType ?? "AzureDataLakeStoreSource";
diff --git a/src/AzureDataFactory.TestingFramework/Generated/Models/AzureDataLakeStoreWriteSettings.Serialization.cs b/src/AzureDataFactory.TestingFramework/Generated/Models/AzureDataLakeStoreWriteSettings.Serialization.cs
index ec6b2333..e85173c3 100644
--- a/src/AzureDataFactory.TestingFramework/Generated/Models/AzureDataLakeStoreWriteSettings.Serialization.cs
+++ b/src/AzureDataFactory.TestingFramework/Generated/Models/AzureDataLakeStoreWriteSettings.Serialization.cs
@@ -65,8 +65,8 @@ internal static AzureDataLakeStoreWriteSettings DeserializeAzureDataLakeStoreWri
             Optional<DataFactoryElement<int>> maxConcurrentConnections = default;
             Optional<DataFactoryElement<bool>> disableMetricsCollection = default;
             Optional<BinaryData> copyBehavior = default;
-            IDictionary<string, BinaryData> additionalProperties = default;
-            Dictionary<string, BinaryData> additionalPropertiesDictionary = new Dictionary<string, BinaryData>();
+            IDictionary<string, DataFactoryElement<string>> additionalProperties = default;
+            Dictionary<string, DataFactoryElement<string>> additionalPropertiesDictionary = new Dictionary<string, DataFactoryElement<string>>();
             foreach (var property in element.EnumerateObject())
             {
                 if (property.NameEquals("expiryDateTime"u8))
@@ -110,7 +110,7 @@ internal static AzureDataLakeStoreWriteSettings DeserializeAzureDataLakeStoreWri
                     copyBehavior = BinaryData.FromString(property.Value.GetRawText());
                     continue;
                 }
-                additionalPropertiesDictionary.Add(property.Name, BinaryData.FromString(property.Value.GetRawText()));
+                additionalPropertiesDictionary.Add(property.Name, JsonSerializer.Deserialize<DataFactoryElement<string>>(property.Value.GetRawText()));
             }
             additionalProperties = additionalPropertiesDictionary;
             return new AzureDataLakeStoreWriteSettings(type, maxConcurrentConnections.Value, disableMetricsCollection.Value, copyBehavior.Value, additionalProperties, expiryDateTime.Value);
diff --git a/src/AzureDataFactory.TestingFramework/Generated/Models/AzureDataLakeStoreWriteSettings.cs b/src/AzureDataFactory.TestingFramework/Generated/Models/AzureDataLakeStoreWriteSettings.cs
index bceffbd3..91de5e7f 100644
--- a/src/AzureDataFactory.TestingFramework/Generated/Models/AzureDataLakeStoreWriteSettings.cs
+++ b/src/AzureDataFactory.TestingFramework/Generated/Models/AzureDataLakeStoreWriteSettings.cs
@@ -25,7 +25,7 @@ public AzureDataLakeStoreWriteSettings()
         /// <param name="copyBehavior"> The type of copy behavior for copy sink. </param>
         /// <param name="additionalProperties"> Additional Properties. </param>
         /// <param name="expiryDateTime"> Specifies the expiry time of the written files. The time is applied to the UTC time zone in the format of "2018-12-01T05:00:00Z". Default value is NULL. Type: string (or Expression with resultType string). </param>
-        internal AzureDataLakeStoreWriteSettings(string storeWriteSettingsType, DataFactoryElement<int> maxConcurrentConnections, DataFactoryElement<bool> disableMetricsCollection, BinaryData copyBehavior, IDictionary<string, BinaryData> additionalProperties, DataFactoryElement<string> expiryDateTime) : base(storeWriteSettingsType, maxConcurrentConnections, disableMetricsCollection, copyBehavior, additionalProperties)
+        internal AzureDataLakeStoreWriteSettings(string storeWriteSettingsType, DataFactoryElement<int> maxConcurrentConnections, DataFactoryElement<bool> disableMetricsCollection, BinaryData copyBehavior, IDictionary<string, DataFactoryElement<string>> additionalProperties, DataFactoryElement<string> expiryDateTime) : base(storeWriteSettingsType, maxConcurrentConnections, disableMetricsCollection, copyBehavior, additionalProperties)
         {
             ExpiryDateTime = expiryDateTime;
             StoreWriteSettingsType = storeWriteSettingsType ?? "AzureDataLakeStoreWriteSettings";
diff --git a/src/AzureDataFactory.TestingFramework/Generated/Models/AzureDatabricksDeltaLakeDataset.Serialization.cs b/src/AzureDataFactory.TestingFramework/Generated/Models/AzureDatabricksDeltaLakeDataset.Serialization.cs
index 4e3e5a82..9d0583c8 100644
--- a/src/AzureDataFactory.TestingFramework/Generated/Models/AzureDatabricksDeltaLakeDataset.Serialization.cs
+++ b/src/AzureDataFactory.TestingFramework/Generated/Models/AzureDatabricksDeltaLakeDataset.Serialization.cs
@@ -110,8 +110,8 @@ internal static AzureDatabricksDeltaLakeDataset DeserializeAzureDatabricksDeltaL
             Optional<DatasetFolder> folder = default;
             Optional<DataFactoryElement<string>> table = default;
             Optional<DataFactoryElement<string>> database = default;
-            IDictionary<string, BinaryData> additionalProperties = default;
-            Dictionary<string, BinaryData> additionalPropertiesDictionary = new Dictionary<string, BinaryData>();
+            IDictionary<string, DataFactoryElement<string>> additionalProperties = default;
+            Dictionary<string, DataFactoryElement<string>> additionalPropertiesDictionary = new Dictionary<string, DataFactoryElement<string>>();
             foreach (var property in element.EnumerateObject())
             {
                 if (property.NameEquals("type"u8))
@@ -221,7 +221,7 @@ internal static AzureDatabricksDeltaLakeDataset DeserializeAzureDatabricksDeltaL
                     }
                     continue;
                 }
-                additionalPropertiesDictionary.Add(property.Name, BinaryData.FromString(property.Value.GetRawText()));
+                additionalPropertiesDictionary.Add(property.Name, JsonSerializer.Deserialize<DataFactoryElement<string>>(property.Value.GetRawText()));
             }
             additionalProperties = additionalPropertiesDictionary;
             return new AzureDatabricksDeltaLakeDataset(type, description.Value, structure.Value, schema.Value, linkedServiceName, Optional.ToDictionary(parameters), Optional.ToList(annotations), folder.Value, additionalProperties, table.Value, database.Value);
diff --git a/src/AzureDataFactory.TestingFramework/Generated/Models/AzureDatabricksDeltaLakeDataset.cs b/src/AzureDataFactory.TestingFramework/Generated/Models/AzureDatabricksDeltaLakeDataset.cs
index c8cae949..00e81af6 100644
--- a/src/AzureDataFactory.TestingFramework/Generated/Models/AzureDatabricksDeltaLakeDataset.cs
+++ b/src/AzureDataFactory.TestingFramework/Generated/Models/AzureDatabricksDeltaLakeDataset.cs
@@ -35,7 +35,7 @@ public AzureDatabricksDeltaLakeDataset(DataFactoryLinkedServiceReference linkedS
         /// <param name="additionalProperties"> Additional Properties. </param>
         /// <param name="table"> The name of delta table. Type: string (or Expression with resultType string). </param>
         /// <param name="database"> The database name of delta table. Type: string (or Expression with resultType string). </param>
-        internal AzureDatabricksDeltaLakeDataset(string datasetType, string description, DataFactoryElement<IList<DatasetDataElement>> structure, DataFactoryElement<IList<DatasetSchemaDataElement>> schema, DataFactoryLinkedServiceReference linkedServiceName, IDictionary<string, EntityParameterSpecification> parameters, IList<BinaryData> annotations, DatasetFolder folder, IDictionary<string, BinaryData> additionalProperties, DataFactoryElement<string> table, DataFactoryElement<string> database) : base(datasetType, description, structure, schema, linkedServiceName, parameters, annotations, folder, additionalProperties)
+        internal AzureDatabricksDeltaLakeDataset(string datasetType, string description, DataFactoryElement<IList<DatasetDataElement>> structure, DataFactoryElement<IList<DatasetSchemaDataElement>> schema, DataFactoryLinkedServiceReference linkedServiceName, IDictionary<string, EntityParameterSpecification> parameters, IList<BinaryData> annotations, DatasetFolder folder, IDictionary<string, DataFactoryElement<string>> additionalProperties, DataFactoryElement<string> table, DataFactoryElement<string> database) : base(datasetType, description, structure, schema, linkedServiceName, parameters, annotations, folder, additionalProperties)
         {
             Table = table;
             Database = database;
diff --git a/src/AzureDataFactory.TestingFramework/Generated/Models/AzureDatabricksDeltaLakeExportCommand.Serialization.cs b/src/AzureDataFactory.TestingFramework/Generated/Models/AzureDatabricksDeltaLakeExportCommand.Serialization.cs
index bef03bb7..cd91d21f 100644
--- a/src/AzureDataFactory.TestingFramework/Generated/Models/AzureDatabricksDeltaLakeExportCommand.Serialization.cs
+++ b/src/AzureDataFactory.TestingFramework/Generated/Models/AzureDatabricksDeltaLakeExportCommand.Serialization.cs
@@ -49,8 +49,8 @@ internal static AzureDatabricksDeltaLakeExportCommand DeserializeAzureDatabricks
             Optional<DataFactoryElement<string>> dateFormat = default;
             Optional<DataFactoryElement<string>> timestampFormat = default;
             string type = default;
-            IDictionary<string, BinaryData> additionalProperties = default;
-            Dictionary<string, BinaryData> additionalPropertiesDictionary = new Dictionary<string, BinaryData>();
+            IDictionary<string, DataFactoryElement<string>> additionalProperties = default;
+            Dictionary<string, DataFactoryElement<string>> additionalPropertiesDictionary = new Dictionary<string, DataFactoryElement<string>>();
             foreach (var property in element.EnumerateObject())
             {
                 if (property.NameEquals("dateFormat"u8))
@@ -76,7 +76,7 @@ internal static AzureDatabricksDeltaLakeExportCommand DeserializeAzureDatabricks
                     type = property.Value.GetString();
                     continue;
                 }
-                additionalPropertiesDictionary.Add(property.Name, BinaryData.FromString(property.Value.GetRawText()));
+                additionalPropertiesDictionary.Add(property.Name, JsonSerializer.Deserialize<DataFactoryElement<string>>(property.Value.GetRawText()));
             }
             additionalProperties = additionalPropertiesDictionary;
             return new AzureDatabricksDeltaLakeExportCommand(type, additionalProperties, dateFormat.Value, timestampFormat.Value);
diff --git a/src/AzureDataFactory.TestingFramework/Generated/Models/AzureDatabricksDeltaLakeExportCommand.cs b/src/AzureDataFactory.TestingFramework/Generated/Models/AzureDatabricksDeltaLakeExportCommand.cs
index e5d30f40..e8ad948a 100644
--- a/src/AzureDataFactory.TestingFramework/Generated/Models/AzureDatabricksDeltaLakeExportCommand.cs
+++ b/src/AzureDataFactory.TestingFramework/Generated/Models/AzureDatabricksDeltaLakeExportCommand.cs
@@ -23,7 +23,7 @@ public AzureDatabricksDeltaLakeExportCommand()
         /// <param name="additionalProperties"> Additional Properties. </param>
         /// <param name="dateFormat"> Specify the date format for the csv in Azure Databricks Delta Lake Copy. Type: string (or Expression with resultType string). </param>
         /// <param name="timestampFormat"> Specify the timestamp format for the csv in Azure Databricks Delta Lake Copy. Type: string (or Expression with resultType string). </param>
-        internal AzureDatabricksDeltaLakeExportCommand(string exportSettingsType, IDictionary<string, BinaryData> additionalProperties, DataFactoryElement<string> dateFormat, DataFactoryElement<string> timestampFormat) : base(exportSettingsType, additionalProperties)
+        internal AzureDatabricksDeltaLakeExportCommand(string exportSettingsType, IDictionary<string, DataFactoryElement<string>> additionalProperties, DataFactoryElement<string> dateFormat, DataFactoryElement<string> timestampFormat) : base(exportSettingsType, additionalProperties)
         {
             DateFormat = dateFormat;
             TimestampFormat = timestampFormat;
diff --git a/src/AzureDataFactory.TestingFramework/Generated/Models/AzureDatabricksDeltaLakeImportCommand.Serialization.cs b/src/AzureDataFactory.TestingFramework/Generated/Models/AzureDatabricksDeltaLakeImportCommand.Serialization.cs
index 20fb96b4..913549d7 100644
--- a/src/AzureDataFactory.TestingFramework/Generated/Models/AzureDatabricksDeltaLakeImportCommand.Serialization.cs
+++ b/src/AzureDataFactory.TestingFramework/Generated/Models/AzureDatabricksDeltaLakeImportCommand.Serialization.cs
@@ -49,8 +49,8 @@ internal static AzureDatabricksDeltaLakeImportCommand DeserializeAzureDatabricks
             Optional<DataFactoryElement<string>> dateFormat = default;
             Optional<DataFactoryElement<string>> timestampFormat = default;
             string type = default;
-            IDictionary<string, BinaryData> additionalProperties = default;
-            Dictionary<string, BinaryData> additionalPropertiesDictionary = new Dictionary<string, BinaryData>();
+            IDictionary<string, DataFactoryElement<string>> additionalProperties = default;
+            Dictionary<string, DataFactoryElement<string>> additionalPropertiesDictionary = new Dictionary<string, DataFactoryElement<string>>();
             foreach (var property in element.EnumerateObject())
             {
                 if (property.NameEquals("dateFormat"u8))
@@ -76,7 +76,7 @@ internal static AzureDatabricksDeltaLakeImportCommand DeserializeAzureDatabricks
                     type = property.Value.GetString();
                     continue;
                 }
-                additionalPropertiesDictionary.Add(property.Name, BinaryData.FromString(property.Value.GetRawText()));
+                additionalPropertiesDictionary.Add(property.Name, JsonSerializer.Deserialize<DataFactoryElement<string>>(property.Value.GetRawText()));
             }
             additionalProperties = additionalPropertiesDictionary;
             return new AzureDatabricksDeltaLakeImportCommand(type, additionalProperties, dateFormat.Value, timestampFormat.Value);
diff --git a/src/AzureDataFactory.TestingFramework/Generated/Models/AzureDatabricksDeltaLakeImportCommand.cs b/src/AzureDataFactory.TestingFramework/Generated/Models/AzureDatabricksDeltaLakeImportCommand.cs
index 0500bd7f..71dcbff9 100644
--- a/src/AzureDataFactory.TestingFramework/Generated/Models/AzureDatabricksDeltaLakeImportCommand.cs
+++ b/src/AzureDataFactory.TestingFramework/Generated/Models/AzureDatabricksDeltaLakeImportCommand.cs
@@ -23,7 +23,7 @@ public AzureDatabricksDeltaLakeImportCommand()
         /// <param name="additionalProperties"> Additional Properties. </param>
         /// <param name="dateFormat"> Specify the date format for csv in Azure Databricks Delta Lake Copy. Type: string (or Expression with resultType string). </param>
         /// <param name="timestampFormat"> Specify the timestamp format for csv in Azure Databricks Delta Lake Copy. Type: string (or Expression with resultType string). </param>
-        internal AzureDatabricksDeltaLakeImportCommand(string importSettingsType, IDictionary<string, BinaryData> additionalProperties, DataFactoryElement<string> dateFormat, DataFactoryElement<string> timestampFormat) : base(importSettingsType, additionalProperties)
+        internal AzureDatabricksDeltaLakeImportCommand(string importSettingsType, IDictionary<string, DataFactoryElement<string>> additionalProperties, DataFactoryElement<string> dateFormat, DataFactoryElement<string> timestampFormat) : base(importSettingsType, additionalProperties)
         {
             DateFormat = dateFormat;
             TimestampFormat = timestampFormat;
diff --git a/src/AzureDataFactory.TestingFramework/Generated/Models/AzureDatabricksDeltaLakeLinkedService.Serialization.cs b/src/AzureDataFactory.TestingFramework/Generated/Models/AzureDatabricksDeltaLakeLinkedService.Serialization.cs
index af537551..1411b489 100644
--- a/src/AzureDataFactory.TestingFramework/Generated/Models/AzureDatabricksDeltaLakeLinkedService.Serialization.cs
+++ b/src/AzureDataFactory.TestingFramework/Generated/Models/AzureDatabricksDeltaLakeLinkedService.Serialization.cs
@@ -117,8 +117,8 @@ internal static AzureDatabricksDeltaLakeLinkedService DeserializeAzureDatabricks
             Optional<string> encryptedCredential = default;
             Optional<DataFactoryCredentialReference> credential = default;
             Optional<DataFactoryElement<string>> workspaceResourceId = default;
-            IDictionary<string, BinaryData> additionalProperties = default;
-            Dictionary<string, BinaryData> additionalPropertiesDictionary = new Dictionary<string, BinaryData>();
+            IDictionary<string, DataFactoryElement<string>> additionalProperties = default;
+            Dictionary<string, DataFactoryElement<string>> additionalPropertiesDictionary = new Dictionary<string, DataFactoryElement<string>>();
             foreach (var property in element.EnumerateObject())
             {
                 if (property.NameEquals("type"u8))
@@ -233,7 +233,7 @@ internal static AzureDatabricksDeltaLakeLinkedService DeserializeAzureDatabricks
                     }
                     continue;
                 }
-                additionalPropertiesDictionary.Add(property.Name, BinaryData.FromString(property.Value.GetRawText()));
+                additionalPropertiesDictionary.Add(property.Name, JsonSerializer.Deserialize<DataFactoryElement<string>>(property.Value.GetRawText()));
             }
             additionalProperties = additionalPropertiesDictionary;
             return new AzureDatabricksDeltaLakeLinkedService(type, connectVia.Value, description.Value, Optional.ToDictionary(parameters), Optional.ToList(annotations), additionalProperties, domain, accessToken, clusterId.Value, encryptedCredential.Value, credential.Value, workspaceResourceId.Value);
diff --git a/src/AzureDataFactory.TestingFramework/Generated/Models/AzureDatabricksDeltaLakeLinkedService.cs b/src/AzureDataFactory.TestingFramework/Generated/Models/AzureDatabricksDeltaLakeLinkedService.cs
index 5529995e..6818467c 100644
--- a/src/AzureDataFactory.TestingFramework/Generated/Models/AzureDatabricksDeltaLakeLinkedService.cs
+++ b/src/AzureDataFactory.TestingFramework/Generated/Models/AzureDatabricksDeltaLakeLinkedService.cs
@@ -37,7 +37,7 @@ public AzureDatabricksDeltaLakeLinkedService(DataFactoryElement<string> domain)
         /// <param name="encryptedCredential"> The encrypted credential used for authentication. Credentials are encrypted using the integration runtime credential manager. Type: string. </param>
         /// <param name="credential"> The credential reference containing authentication information. </param>
         /// <param name="workspaceResourceId"> Workspace resource id for databricks REST API. Type: string (or Expression with resultType string). </param>
-        internal AzureDatabricksDeltaLakeLinkedService(string linkedServiceType, IntegrationRuntimeReference connectVia, string description, IDictionary<string, EntityParameterSpecification> parameters, IList<BinaryData> annotations, IDictionary<string, BinaryData> additionalProperties, DataFactoryElement<string> domain, DataFactorySecretBaseDefinition accessToken, DataFactoryElement<string> clusterId, string encryptedCredential, DataFactoryCredentialReference credential, DataFactoryElement<string> workspaceResourceId) : base(linkedServiceType, connectVia, description, parameters, annotations, additionalProperties)
+        internal AzureDatabricksDeltaLakeLinkedService(string linkedServiceType, IntegrationRuntimeReference connectVia, string description, IDictionary<string, EntityParameterSpecification> parameters, IList<BinaryData> annotations, IDictionary<string, DataFactoryElement<string>> additionalProperties, DataFactoryElement<string> domain, DataFactorySecretBaseDefinition accessToken, DataFactoryElement<string> clusterId, string encryptedCredential, DataFactoryCredentialReference credential, DataFactoryElement<string> workspaceResourceId) : base(linkedServiceType, connectVia, description, parameters, annotations, additionalProperties)
         {
             Domain = domain;
             AccessToken = accessToken;
diff --git a/src/AzureDataFactory.TestingFramework/Generated/Models/AzureDatabricksDeltaLakeSink.Serialization.cs b/src/AzureDataFactory.TestingFramework/Generated/Models/AzureDatabricksDeltaLakeSink.Serialization.cs
index b09d7d32..b5ca5ab9 100644
--- a/src/AzureDataFactory.TestingFramework/Generated/Models/AzureDatabricksDeltaLakeSink.Serialization.cs
+++ b/src/AzureDataFactory.TestingFramework/Generated/Models/AzureDatabricksDeltaLakeSink.Serialization.cs
@@ -85,8 +85,8 @@ internal static AzureDatabricksDeltaLakeSink DeserializeAzureDatabricksDeltaLake
             Optional<DataFactoryElement<string>> sinkRetryWait = default;
             Optional<DataFactoryElement<int>> maxConcurrentConnections = default;
             Optional<DataFactoryElement<bool>> disableMetricsCollection = default;
-            IDictionary<string, BinaryData> additionalProperties = default;
-            Dictionary<string, BinaryData> additionalPropertiesDictionary = new Dictionary<string, BinaryData>();
+            IDictionary<string, DataFactoryElement<string>> additionalProperties = default;
+            Dictionary<string, DataFactoryElement<string>> additionalPropertiesDictionary = new Dictionary<string, DataFactoryElement<string>>();
             foreach (var property in element.EnumerateObject())
             {
                 if (property.NameEquals("preCopyScript"u8))
@@ -166,7 +166,7 @@ internal static AzureDatabricksDeltaLakeSink DeserializeAzureDatabricksDeltaLake
                     disableMetricsCollection = JsonSerializer.Deserialize<DataFactoryElement<bool>>(property.Value.GetRawText());
                     continue;
                 }
-                additionalPropertiesDictionary.Add(property.Name, BinaryData.FromString(property.Value.GetRawText()));
+                additionalPropertiesDictionary.Add(property.Name, JsonSerializer.Deserialize<DataFactoryElement<string>>(property.Value.GetRawText()));
             }
             additionalProperties = additionalPropertiesDictionary;
             return new AzureDatabricksDeltaLakeSink(type, writeBatchSize.Value, writeBatchTimeout.Value, sinkRetryCount.Value, sinkRetryWait.Value, maxConcurrentConnections.Value, disableMetricsCollection.Value, additionalProperties, preCopyScript.Value, importSettings.Value);
diff --git a/src/AzureDataFactory.TestingFramework/Generated/Models/AzureDatabricksDeltaLakeSink.cs b/src/AzureDataFactory.TestingFramework/Generated/Models/AzureDatabricksDeltaLakeSink.cs
index 2a1923b9..5d3b719a 100644
--- a/src/AzureDataFactory.TestingFramework/Generated/Models/AzureDatabricksDeltaLakeSink.cs
+++ b/src/AzureDataFactory.TestingFramework/Generated/Models/AzureDatabricksDeltaLakeSink.cs
@@ -29,7 +29,7 @@ public AzureDatabricksDeltaLakeSink()
         /// <param name="additionalProperties"> Additional Properties. </param>
         /// <param name="preCopyScript"> SQL pre-copy script. Type: string (or Expression with resultType string). </param>
         /// <param name="importSettings"> Azure Databricks Delta Lake import settings. </param>
-        internal AzureDatabricksDeltaLakeSink(string copySinkType, DataFactoryElement<int> writeBatchSize, DataFactoryElement<string> writeBatchTimeout, DataFactoryElement<int> sinkRetryCount, DataFactoryElement<string> sinkRetryWait, DataFactoryElement<int> maxConcurrentConnections, DataFactoryElement<bool> disableMetricsCollection, IDictionary<string, BinaryData> additionalProperties, DataFactoryElement<string> preCopyScript, AzureDatabricksDeltaLakeImportCommand importSettings) : base(copySinkType, writeBatchSize, writeBatchTimeout, sinkRetryCount, sinkRetryWait, maxConcurrentConnections, disableMetricsCollection, additionalProperties)
+        internal AzureDatabricksDeltaLakeSink(string copySinkType, DataFactoryElement<int> writeBatchSize, DataFactoryElement<string> writeBatchTimeout, DataFactoryElement<int> sinkRetryCount, DataFactoryElement<string> sinkRetryWait, DataFactoryElement<int> maxConcurrentConnections, DataFactoryElement<bool> disableMetricsCollection, IDictionary<string, DataFactoryElement<string>> additionalProperties, DataFactoryElement<string> preCopyScript, AzureDatabricksDeltaLakeImportCommand importSettings) : base(copySinkType, writeBatchSize, writeBatchTimeout, sinkRetryCount, sinkRetryWait, maxConcurrentConnections, disableMetricsCollection, additionalProperties)
         {
             PreCopyScript = preCopyScript;
             ImportSettings = importSettings;
diff --git a/src/AzureDataFactory.TestingFramework/Generated/Models/AzureDatabricksDeltaLakeSource.Serialization.cs b/src/AzureDataFactory.TestingFramework/Generated/Models/AzureDatabricksDeltaLakeSource.Serialization.cs
index a54d1e00..c2e3a1bf 100644
--- a/src/AzureDataFactory.TestingFramework/Generated/Models/AzureDatabricksDeltaLakeSource.Serialization.cs
+++ b/src/AzureDataFactory.TestingFramework/Generated/Models/AzureDatabricksDeltaLakeSource.Serialization.cs
@@ -73,8 +73,8 @@ internal static AzureDatabricksDeltaLakeSource DeserializeAzureDatabricksDeltaLa
             Optional<DataFactoryElement<string>> sourceRetryWait = default;
             Optional<DataFactoryElement<int>> maxConcurrentConnections = default;
             Optional<DataFactoryElement<bool>> disableMetricsCollection = default;
-            IDictionary<string, BinaryData> additionalProperties = default;
-            Dictionary<string, BinaryData> additionalPropertiesDictionary = new Dictionary<string, BinaryData>();
+            IDictionary<string, DataFactoryElement<string>> additionalProperties = default;
+            Dictionary<string, DataFactoryElement<string>> additionalPropertiesDictionary = new Dictionary<string, DataFactoryElement<string>>();
             foreach (var property in element.EnumerateObject())
             {
                 if (property.NameEquals("query"u8))
@@ -136,7 +136,7 @@ internal static AzureDatabricksDeltaLakeSource DeserializeAzureDatabricksDeltaLa
                     disableMetricsCollection = JsonSerializer.Deserialize<DataFactoryElement<bool>>(property.Value.GetRawText());
                     continue;
                 }
-                additionalPropertiesDictionary.Add(property.Name, BinaryData.FromString(property.Value.GetRawText()));
+                additionalPropertiesDictionary.Add(property.Name, JsonSerializer.Deserialize<DataFactoryElement<string>>(property.Value.GetRawText()));
             }
             additionalProperties = additionalPropertiesDictionary;
             return new AzureDatabricksDeltaLakeSource(type, sourceRetryCount.Value, sourceRetryWait.Value, maxConcurrentConnections.Value, disableMetricsCollection.Value, additionalProperties, query.Value, exportSettings.Value);
diff --git a/src/AzureDataFactory.TestingFramework/Generated/Models/AzureDatabricksDeltaLakeSource.cs b/src/AzureDataFactory.TestingFramework/Generated/Models/AzureDatabricksDeltaLakeSource.cs
index dceb3c8c..532dbd77 100644
--- a/src/AzureDataFactory.TestingFramework/Generated/Models/AzureDatabricksDeltaLakeSource.cs
+++ b/src/AzureDataFactory.TestingFramework/Generated/Models/AzureDatabricksDeltaLakeSource.cs
@@ -27,7 +27,7 @@ public AzureDatabricksDeltaLakeSource()
         /// <param name="additionalProperties"> Additional Properties. </param>
         /// <param name="query"> Azure Databricks Delta Lake Sql query. Type: string (or Expression with resultType string). </param>
         /// <param name="exportSettings"> Azure Databricks Delta Lake export settings. </param>
-        internal AzureDatabricksDeltaLakeSource(string copySourceType, DataFactoryElement<int> sourceRetryCount, DataFactoryElement<string> sourceRetryWait, DataFactoryElement<int> maxConcurrentConnections, DataFactoryElement<bool> disableMetricsCollection, IDictionary<string, BinaryData> additionalProperties, DataFactoryElement<string> query, AzureDatabricksDeltaLakeExportCommand exportSettings) : base(copySourceType, sourceRetryCount, sourceRetryWait, maxConcurrentConnections, disableMetricsCollection, additionalProperties)
+        internal AzureDatabricksDeltaLakeSource(string copySourceType, DataFactoryElement<int> sourceRetryCount, DataFactoryElement<string> sourceRetryWait, DataFactoryElement<int> maxConcurrentConnections, DataFactoryElement<bool> disableMetricsCollection, IDictionary<string, DataFactoryElement<string>> additionalProperties, DataFactoryElement<string> query, AzureDatabricksDeltaLakeExportCommand exportSettings) : base(copySourceType, sourceRetryCount, sourceRetryWait, maxConcurrentConnections, disableMetricsCollection, additionalProperties)
         {
             Query = query;
             ExportSettings = exportSettings;
diff --git a/src/AzureDataFactory.TestingFramework/Generated/Models/AzureDatabricksLinkedService.Serialization.cs b/src/AzureDataFactory.TestingFramework/Generated/Models/AzureDatabricksLinkedService.Serialization.cs
index 81511ad2..1c930db2 100644
--- a/src/AzureDataFactory.TestingFramework/Generated/Models/AzureDatabricksLinkedService.Serialization.cs
+++ b/src/AzureDataFactory.TestingFramework/Generated/Models/AzureDatabricksLinkedService.Serialization.cs
@@ -230,9 +230,9 @@ internal static AzureDatabricksLinkedService DeserializeAzureDatabricksLinkedSer
             Optional<DataFactoryElement<string>> newClusterVersion = default;
             Optional<DataFactoryElement<string>> newClusterNumOfWorker = default;
             Optional<DataFactoryElement<string>> newClusterNodeType = default;
-            Optional<IDictionary<string, BinaryData>> newClusterSparkConf = default;
-            Optional<IDictionary<string, BinaryData>> newClusterSparkEnvVars = default;
-            Optional<IDictionary<string, BinaryData>> newClusterCustomTags = default;
+            Optional<IDictionary<string, DataFactoryElement<string>>> newClusterSparkConf = default;
+            Optional<IDictionary<string, DataFactoryElement<string>>> newClusterSparkEnvVars = default;
+            Optional<IDictionary<string, DataFactoryElement<string>>> newClusterCustomTags = default;
             Optional<DataFactoryElement<string>> newClusterLogDestination = default;
             Optional<DataFactoryElement<string>> newClusterDriverNodeType = default;
             Optional<DataFactoryElement<IList<string>>> newClusterInitScripts = default;
@@ -240,8 +240,8 @@ internal static AzureDatabricksLinkedService DeserializeAzureDatabricksLinkedSer
             Optional<string> encryptedCredential = default;
             Optional<DataFactoryElement<string>> policyId = default;
             Optional<DataFactoryCredentialReference> credential = default;
-            IDictionary<string, BinaryData> additionalProperties = default;
-            Dictionary<string, BinaryData> additionalPropertiesDictionary = new Dictionary<string, BinaryData>();
+            IDictionary<string, DataFactoryElement<string>> additionalProperties = default;
+            Dictionary<string, DataFactoryElement<string>> additionalPropertiesDictionary = new Dictionary<string, DataFactoryElement<string>>();
             foreach (var property in element.EnumerateObject())
             {
                 if (property.NameEquals("type"u8))
@@ -390,7 +390,7 @@ internal static AzureDatabricksLinkedService DeserializeAzureDatabricksLinkedSer
                             {
                                 continue;
                             }
-                            Dictionary<string, BinaryData> dictionary = new Dictionary<string, BinaryData>();
+                            Dictionary<string, DataFactoryElement<string>> dictionary = new Dictionary<string, DataFactoryElement<string>>();
                             foreach (var property1 in property0.Value.EnumerateObject())
                             {
                                 if (property1.Value.ValueKind == JsonValueKind.Null)
@@ -399,7 +399,7 @@ internal static AzureDatabricksLinkedService DeserializeAzureDatabricksLinkedSer
                                 }
                                 else
                                 {
-                                    dictionary.Add(property1.Name, BinaryData.FromString(property1.Value.GetRawText()));
+                                    dictionary.Add(property1.Name, JsonSerializer.Deserialize<DataFactoryElement<string>>(property1.Value.GetRawText()));
                                 }
                             }
                             newClusterSparkConf = dictionary;
@@ -411,7 +411,7 @@ internal static AzureDatabricksLinkedService DeserializeAzureDatabricksLinkedSer
                             {
                                 continue;
                             }
-                            Dictionary<string, BinaryData> dictionary = new Dictionary<string, BinaryData>();
+                            Dictionary<string, DataFactoryElement<string>> dictionary = new Dictionary<string, DataFactoryElement<string>>();
                             foreach (var property1 in property0.Value.EnumerateObject())
                             {
                                 if (property1.Value.ValueKind == JsonValueKind.Null)
@@ -420,7 +420,7 @@ internal static AzureDatabricksLinkedService DeserializeAzureDatabricksLinkedSer
                                 }
                                 else
                                 {
-                                    dictionary.Add(property1.Name, BinaryData.FromString(property1.Value.GetRawText()));
+                                    dictionary.Add(property1.Name, JsonSerializer.Deserialize<DataFactoryElement<string>>(property1.Value.GetRawText()));
                                 }
                             }
                             newClusterSparkEnvVars = dictionary;
@@ -432,7 +432,7 @@ internal static AzureDatabricksLinkedService DeserializeAzureDatabricksLinkedSer
                             {
                                 continue;
                             }
-                            Dictionary<string, BinaryData> dictionary = new Dictionary<string, BinaryData>();
+                            Dictionary<string, DataFactoryElement<string>> dictionary = new Dictionary<string, DataFactoryElement<string>>();
                             foreach (var property1 in property0.Value.EnumerateObject())
                             {
                                 if (property1.Value.ValueKind == JsonValueKind.Null)
@@ -441,7 +441,7 @@ internal static AzureDatabricksLinkedService DeserializeAzureDatabricksLinkedSer
                                 }
                                 else
                                 {
-                                    dictionary.Add(property1.Name, BinaryData.FromString(property1.Value.GetRawText()));
+                                    dictionary.Add(property1.Name, JsonSerializer.Deserialize<DataFactoryElement<string>>(property1.Value.GetRawText()));
                                 }
                             }
                             newClusterCustomTags = dictionary;
@@ -509,7 +509,7 @@ internal static AzureDatabricksLinkedService DeserializeAzureDatabricksLinkedSer
                     }
                     continue;
                 }
-                additionalPropertiesDictionary.Add(property.Name, BinaryData.FromString(property.Value.GetRawText()));
+                additionalPropertiesDictionary.Add(property.Name, JsonSerializer.Deserialize<DataFactoryElement<string>>(property.Value.GetRawText()));
             }
             additionalProperties = additionalPropertiesDictionary;
             return new AzureDatabricksLinkedService(type, connectVia.Value, description.Value, Optional.ToDictionary(parameters), Optional.ToList(annotations), additionalProperties, domain, accessToken, authentication.Value, workspaceResourceId.Value, existingClusterId.Value, instancePoolId.Value, newClusterVersion.Value, newClusterNumOfWorker.Value, newClusterNodeType.Value, Optional.ToDictionary(newClusterSparkConf), Optional.ToDictionary(newClusterSparkEnvVars), Optional.ToDictionary(newClusterCustomTags), newClusterLogDestination.Value, newClusterDriverNodeType.Value, newClusterInitScripts.Value, newClusterEnableElasticDisk.Value, encryptedCredential.Value, policyId.Value, credential.Value);
diff --git a/src/AzureDataFactory.TestingFramework/Generated/Models/AzureDatabricksLinkedService.cs b/src/AzureDataFactory.TestingFramework/Generated/Models/AzureDatabricksLinkedService.cs
index ae98b592..8c608fca 100644
--- a/src/AzureDataFactory.TestingFramework/Generated/Models/AzureDatabricksLinkedService.cs
+++ b/src/AzureDataFactory.TestingFramework/Generated/Models/AzureDatabricksLinkedService.cs
@@ -21,9 +21,9 @@ public AzureDatabricksLinkedService(DataFactoryElement<string> domain)
             Argument.AssertNotNull(domain, nameof(domain));
 
             Domain = domain;
-            NewClusterSparkConf = new ChangeTrackingDictionary<string, BinaryData>();
-            NewClusterSparkEnvVars = new ChangeTrackingDictionary<string, BinaryData>();
-            NewClusterCustomTags = new ChangeTrackingDictionary<string, BinaryData>();
+            NewClusterSparkConf = new ChangeTrackingDictionary<string, DataFactoryElement<string>>();
+            NewClusterSparkEnvVars = new ChangeTrackingDictionary<string, DataFactoryElement<string>>();
+            NewClusterCustomTags = new ChangeTrackingDictionary<string, DataFactoryElement<string>>();
             LinkedServiceType = "AzureDatabricks";
         }
 
@@ -53,7 +53,7 @@ public AzureDatabricksLinkedService(DataFactoryElement<string> domain)
         /// <param name="encryptedCredential"> The encrypted credential used for authentication. Credentials are encrypted using the integration runtime credential manager. Type: string. </param>
         /// <param name="policyId"> The policy id for limiting the ability to configure clusters based on a user defined set of rules. Type: string (or Expression with resultType string). </param>
         /// <param name="credential"> The credential reference containing authentication information. </param>
-        internal AzureDatabricksLinkedService(string linkedServiceType, IntegrationRuntimeReference connectVia, string description, IDictionary<string, EntityParameterSpecification> parameters, IList<BinaryData> annotations, IDictionary<string, BinaryData> additionalProperties, DataFactoryElement<string> domain, DataFactorySecretBaseDefinition accessToken, DataFactoryElement<string> authentication, DataFactoryElement<string> workspaceResourceId, DataFactoryElement<string> existingClusterId, DataFactoryElement<string> instancePoolId, DataFactoryElement<string> newClusterVersion, DataFactoryElement<string> newClusterNumOfWorker, DataFactoryElement<string> newClusterNodeType, IDictionary<string, BinaryData> newClusterSparkConf, IDictionary<string, BinaryData> newClusterSparkEnvVars, IDictionary<string, BinaryData> newClusterCustomTags, DataFactoryElement<string> newClusterLogDestination, DataFactoryElement<string> newClusterDriverNodeType, DataFactoryElement<IList<string>> newClusterInitScripts, DataFactoryElement<bool> newClusterEnableElasticDisk, string encryptedCredential, DataFactoryElement<string> policyId, DataFactoryCredentialReference credential) : base(linkedServiceType, connectVia, description, parameters, annotations, additionalProperties)
+        internal AzureDatabricksLinkedService(string linkedServiceType, IntegrationRuntimeReference connectVia, string description, IDictionary<string, EntityParameterSpecification> parameters, IList<BinaryData> annotations, IDictionary<string, DataFactoryElement<string>> additionalProperties, DataFactoryElement<string> domain, DataFactorySecretBaseDefinition accessToken, DataFactoryElement<string> authentication, DataFactoryElement<string> workspaceResourceId, DataFactoryElement<string> existingClusterId, DataFactoryElement<string> instancePoolId, DataFactoryElement<string> newClusterVersion, DataFactoryElement<string> newClusterNumOfWorker, DataFactoryElement<string> newClusterNodeType, IDictionary<string, DataFactoryElement<string>> newClusterSparkConf, IDictionary<string, DataFactoryElement<string>> newClusterSparkEnvVars, IDictionary<string, DataFactoryElement<string>> newClusterCustomTags, DataFactoryElement<string> newClusterLogDestination, DataFactoryElement<string> newClusterDriverNodeType, DataFactoryElement<IList<string>> newClusterInitScripts, DataFactoryElement<bool> newClusterEnableElasticDisk, string encryptedCredential, DataFactoryElement<string> policyId, DataFactoryCredentialReference credential) : base(linkedServiceType, connectVia, description, parameters, annotations, additionalProperties)
         {
             Domain = domain;
             AccessToken = accessToken;
@@ -125,7 +125,7 @@ internal AzureDatabricksLinkedService(string linkedServiceType, IntegrationRunti
         /// </list>
         /// </para>
         /// </summary>
-        public IDictionary<string, BinaryData> NewClusterSparkConf { get; }
+        public IDictionary<string, DataFactoryElement<string>> NewClusterSparkConf { get; }
         /// <summary>
         /// A set of optional, user-specified Spark environment variables key-value pairs.
         /// <para>
@@ -156,7 +156,7 @@ internal AzureDatabricksLinkedService(string linkedServiceType, IntegrationRunti
         /// </list>
         /// </para>
         /// </summary>
-        public IDictionary<string, BinaryData> NewClusterSparkEnvVars { get; }
+        public IDictionary<string, DataFactoryElement<string>> NewClusterSparkEnvVars { get; }
         /// <summary>
         /// Additional tags for cluster resources. This property is ignored in instance pool configurations.
         /// <para>
@@ -187,7 +187,7 @@ internal AzureDatabricksLinkedService(string linkedServiceType, IntegrationRunti
         /// </list>
         /// </para>
         /// </summary>
-        public IDictionary<string, BinaryData> NewClusterCustomTags { get; }
+        public IDictionary<string, DataFactoryElement<string>> NewClusterCustomTags { get; }
         /// <summary> Specify a location to deliver Spark driver, worker, and event logs. Type: string (or Expression with resultType string). </summary>
         public DataFactoryElement<string> NewClusterLogDestination { get; set; }
         /// <summary> The driver node type for the new job cluster. This property is ignored in instance pool configurations. Type: string (or Expression with resultType string). </summary>
diff --git a/src/AzureDataFactory.TestingFramework/Generated/Models/AzureFileStorageLinkedService.Serialization.cs b/src/AzureDataFactory.TestingFramework/Generated/Models/AzureFileStorageLinkedService.Serialization.cs
index ba128c7f..eb3e6932 100644
--- a/src/AzureDataFactory.TestingFramework/Generated/Models/AzureFileStorageLinkedService.Serialization.cs
+++ b/src/AzureDataFactory.TestingFramework/Generated/Models/AzureFileStorageLinkedService.Serialization.cs
@@ -144,8 +144,8 @@ internal static AzureFileStorageLinkedService DeserializeAzureFileStorageLinkedS
             Optional<DataFactoryElement<string>> fileShare = default;
             Optional<DataFactoryElement<string>> snapshot = default;
             Optional<string> encryptedCredential = default;
-            IDictionary<string, BinaryData> additionalProperties = default;
-            Dictionary<string, BinaryData> additionalPropertiesDictionary = new Dictionary<string, BinaryData>();
+            IDictionary<string, DataFactoryElement<string>> additionalProperties = default;
+            Dictionary<string, DataFactoryElement<string>> additionalPropertiesDictionary = new Dictionary<string, DataFactoryElement<string>>();
             foreach (var property in element.EnumerateObject())
             {
                 if (property.NameEquals("type"u8))
@@ -300,7 +300,7 @@ internal static AzureFileStorageLinkedService DeserializeAzureFileStorageLinkedS
                     }
                     continue;
                 }
-                additionalPropertiesDictionary.Add(property.Name, BinaryData.FromString(property.Value.GetRawText()));
+                additionalPropertiesDictionary.Add(property.Name, JsonSerializer.Deserialize<DataFactoryElement<string>>(property.Value.GetRawText()));
             }
             additionalProperties = additionalPropertiesDictionary;
             return new AzureFileStorageLinkedService(type, connectVia.Value, description.Value, Optional.ToDictionary(parameters), Optional.ToList(annotations), additionalProperties, host.Value, userId.Value, password, connectionString.Value, accountKey, sasUri.Value, sasToken, fileShare.Value, snapshot.Value, encryptedCredential.Value);
diff --git a/src/AzureDataFactory.TestingFramework/Generated/Models/AzureFileStorageLinkedService.cs b/src/AzureDataFactory.TestingFramework/Generated/Models/AzureFileStorageLinkedService.cs
index 06d6dd5b..a0a17718 100644
--- a/src/AzureDataFactory.TestingFramework/Generated/Models/AzureFileStorageLinkedService.cs
+++ b/src/AzureDataFactory.TestingFramework/Generated/Models/AzureFileStorageLinkedService.cs
@@ -35,7 +35,7 @@ public AzureFileStorageLinkedService()
         /// <param name="fileShare"> The azure file share name. It is required when auth with accountKey/sasToken. Type: string (or Expression with resultType string). </param>
         /// <param name="snapshot"> The azure file share snapshot version. Type: string (or Expression with resultType string). </param>
         /// <param name="encryptedCredential"> The encrypted credential used for authentication. Credentials are encrypted using the integration runtime credential manager. Type: string. </param>
-        internal AzureFileStorageLinkedService(string linkedServiceType, IntegrationRuntimeReference connectVia, string description, IDictionary<string, EntityParameterSpecification> parameters, IList<BinaryData> annotations, IDictionary<string, BinaryData> additionalProperties, DataFactoryElement<string> host, DataFactoryElement<string> userId, DataFactorySecretBaseDefinition password, DataFactoryElement<string> connectionString, DataFactoryKeyVaultSecretReference accountKey, DataFactoryElement<string> sasUri, DataFactoryKeyVaultSecretReference sasToken, DataFactoryElement<string> fileShare, DataFactoryElement<string> snapshot, string encryptedCredential) : base(linkedServiceType, connectVia, description, parameters, annotations, additionalProperties)
+        internal AzureFileStorageLinkedService(string linkedServiceType, IntegrationRuntimeReference connectVia, string description, IDictionary<string, EntityParameterSpecification> parameters, IList<BinaryData> annotations, IDictionary<string, DataFactoryElement<string>> additionalProperties, DataFactoryElement<string> host, DataFactoryElement<string> userId, DataFactorySecretBaseDefinition password, DataFactoryElement<string> connectionString, DataFactoryKeyVaultSecretReference accountKey, DataFactoryElement<string> sasUri, DataFactoryKeyVaultSecretReference sasToken, DataFactoryElement<string> fileShare, DataFactoryElement<string> snapshot, string encryptedCredential) : base(linkedServiceType, connectVia, description, parameters, annotations, additionalProperties)
         {
             Host = host;
             UserId = userId;
diff --git a/src/AzureDataFactory.TestingFramework/Generated/Models/AzureFileStorageLocation.Serialization.cs b/src/AzureDataFactory.TestingFramework/Generated/Models/AzureFileStorageLocation.Serialization.cs
index 462b782c..ec57785f 100644
--- a/src/AzureDataFactory.TestingFramework/Generated/Models/AzureFileStorageLocation.Serialization.cs
+++ b/src/AzureDataFactory.TestingFramework/Generated/Models/AzureFileStorageLocation.Serialization.cs
@@ -49,8 +49,8 @@ internal static AzureFileStorageLocation DeserializeAzureFileStorageLocation(Jso
             string type = default;
             Optional<DataFactoryElement<string>> folderPath = default;
             Optional<DataFactoryElement<string>> fileName = default;
-            IDictionary<string, BinaryData> additionalProperties = default;
-            Dictionary<string, BinaryData> additionalPropertiesDictionary = new Dictionary<string, BinaryData>();
+            IDictionary<string, DataFactoryElement<string>> additionalProperties = default;
+            Dictionary<string, DataFactoryElement<string>> additionalPropertiesDictionary = new Dictionary<string, DataFactoryElement<string>>();
             foreach (var property in element.EnumerateObject())
             {
                 if (property.NameEquals("type"u8))
@@ -76,7 +76,7 @@ internal static AzureFileStorageLocation DeserializeAzureFileStorageLocation(Jso
                     fileName = JsonSerializer.Deserialize<DataFactoryElement<string>>(property.Value.GetRawText());
                     continue;
                 }
-                additionalPropertiesDictionary.Add(property.Name, BinaryData.FromString(property.Value.GetRawText()));
+                additionalPropertiesDictionary.Add(property.Name, JsonSerializer.Deserialize<DataFactoryElement<string>>(property.Value.GetRawText()));
             }
             additionalProperties = additionalPropertiesDictionary;
             return new AzureFileStorageLocation(type, folderPath.Value, fileName.Value, additionalProperties);
diff --git a/src/AzureDataFactory.TestingFramework/Generated/Models/AzureFileStorageLocation.cs b/src/AzureDataFactory.TestingFramework/Generated/Models/AzureFileStorageLocation.cs
index 37599eb6..d214ef2b 100644
--- a/src/AzureDataFactory.TestingFramework/Generated/Models/AzureFileStorageLocation.cs
+++ b/src/AzureDataFactory.TestingFramework/Generated/Models/AzureFileStorageLocation.cs
@@ -23,7 +23,7 @@ public AzureFileStorageLocation()
         /// <param name="folderPath"> Specify the folder path of dataset. Type: string (or Expression with resultType string). </param>
         /// <param name="fileName"> Specify the file name of dataset. Type: string (or Expression with resultType string). </param>
         /// <param name="additionalProperties"> Additional Properties. </param>
-        internal AzureFileStorageLocation(string datasetLocationType, DataFactoryElement<string> folderPath, DataFactoryElement<string> fileName, IDictionary<string, BinaryData> additionalProperties) : base(datasetLocationType, folderPath, fileName, additionalProperties)
+        internal AzureFileStorageLocation(string datasetLocationType, DataFactoryElement<string> folderPath, DataFactoryElement<string> fileName, IDictionary<string, DataFactoryElement<string>> additionalProperties) : base(datasetLocationType, folderPath, fileName, additionalProperties)
         {
             DatasetLocationType = datasetLocationType ?? "AzureFileStorageLocation";
         }
diff --git a/src/AzureDataFactory.TestingFramework/Generated/Models/AzureFileStorageReadSettings.Serialization.cs b/src/AzureDataFactory.TestingFramework/Generated/Models/AzureFileStorageReadSettings.Serialization.cs
index 6c4b1714..4985d926 100644
--- a/src/AzureDataFactory.TestingFramework/Generated/Models/AzureFileStorageReadSettings.Serialization.cs
+++ b/src/AzureDataFactory.TestingFramework/Generated/Models/AzureFileStorageReadSettings.Serialization.cs
@@ -109,8 +109,8 @@ internal static AzureFileStorageReadSettings DeserializeAzureFileStorageReadSett
             string type = default;
             Optional<DataFactoryElement<int>> maxConcurrentConnections = default;
             Optional<DataFactoryElement<bool>> disableMetricsCollection = default;
-            IDictionary<string, BinaryData> additionalProperties = default;
-            Dictionary<string, BinaryData> additionalPropertiesDictionary = new Dictionary<string, BinaryData>();
+            IDictionary<string, DataFactoryElement<string>> additionalProperties = default;
+            Dictionary<string, DataFactoryElement<string>> additionalPropertiesDictionary = new Dictionary<string, DataFactoryElement<string>>();
             foreach (var property in element.EnumerateObject())
             {
                 if (property.NameEquals("recursive"u8))
@@ -226,7 +226,7 @@ internal static AzureFileStorageReadSettings DeserializeAzureFileStorageReadSett
                     disableMetricsCollection = JsonSerializer.Deserialize<DataFactoryElement<bool>>(property.Value.GetRawText());
                     continue;
                 }
-                additionalPropertiesDictionary.Add(property.Name, BinaryData.FromString(property.Value.GetRawText()));
+                additionalPropertiesDictionary.Add(property.Name, JsonSerializer.Deserialize<DataFactoryElement<string>>(property.Value.GetRawText()));
             }
             additionalProperties = additionalPropertiesDictionary;
             return new AzureFileStorageReadSettings(type, maxConcurrentConnections.Value, disableMetricsCollection.Value, additionalProperties, recursive.Value, wildcardFolderPath.Value, wildcardFileName.Value, prefix.Value, fileListPath.Value, enablePartitionDiscovery.Value, partitionRootPath.Value, deleteFilesAfterCompletion.Value, modifiedDatetimeStart.Value, modifiedDatetimeEnd.Value);
diff --git a/src/AzureDataFactory.TestingFramework/Generated/Models/AzureFileStorageReadSettings.cs b/src/AzureDataFactory.TestingFramework/Generated/Models/AzureFileStorageReadSettings.cs
index 5d293a40..11bbe2e9 100644
--- a/src/AzureDataFactory.TestingFramework/Generated/Models/AzureFileStorageReadSettings.cs
+++ b/src/AzureDataFactory.TestingFramework/Generated/Models/AzureFileStorageReadSettings.cs
@@ -33,7 +33,7 @@ public AzureFileStorageReadSettings()
         /// <param name="deleteFilesAfterCompletion"> Indicates whether the source files need to be deleted after copy completion. Default is false. Type: boolean (or Expression with resultType boolean). </param>
         /// <param name="modifiedDatetimeStart"> The start of file's modified datetime. Type: string (or Expression with resultType string). </param>
         /// <param name="modifiedDatetimeEnd"> The end of file's modified datetime. Type: string (or Expression with resultType string). </param>
-        internal AzureFileStorageReadSettings(string storeReadSettingsType, DataFactoryElement<int> maxConcurrentConnections, DataFactoryElement<bool> disableMetricsCollection, IDictionary<string, BinaryData> additionalProperties, DataFactoryElement<bool> recursive, DataFactoryElement<string> wildcardFolderPath, DataFactoryElement<string> wildcardFileName, DataFactoryElement<string> prefix, DataFactoryElement<string> fileListPath, DataFactoryElement<bool> enablePartitionDiscovery, DataFactoryElement<string> partitionRootPath, DataFactoryElement<bool> deleteFilesAfterCompletion, DataFactoryElement<string> modifiedDatetimeStart, DataFactoryElement<string> modifiedDatetimeEnd) : base(storeReadSettingsType, maxConcurrentConnections, disableMetricsCollection, additionalProperties)
+        internal AzureFileStorageReadSettings(string storeReadSettingsType, DataFactoryElement<int> maxConcurrentConnections, DataFactoryElement<bool> disableMetricsCollection, IDictionary<string, DataFactoryElement<string>> additionalProperties, DataFactoryElement<bool> recursive, DataFactoryElement<string> wildcardFolderPath, DataFactoryElement<string> wildcardFileName, DataFactoryElement<string> prefix, DataFactoryElement<string> fileListPath, DataFactoryElement<bool> enablePartitionDiscovery, DataFactoryElement<string> partitionRootPath, DataFactoryElement<bool> deleteFilesAfterCompletion, DataFactoryElement<string> modifiedDatetimeStart, DataFactoryElement<string> modifiedDatetimeEnd) : base(storeReadSettingsType, maxConcurrentConnections, disableMetricsCollection, additionalProperties)
         {
             Recursive = recursive;
             WildcardFolderPath = wildcardFolderPath;
diff --git a/src/AzureDataFactory.TestingFramework/Generated/Models/AzureFileStorageWriteSettings.Serialization.cs b/src/AzureDataFactory.TestingFramework/Generated/Models/AzureFileStorageWriteSettings.Serialization.cs
index 91fdd4f7..51321471 100644
--- a/src/AzureDataFactory.TestingFramework/Generated/Models/AzureFileStorageWriteSettings.Serialization.cs
+++ b/src/AzureDataFactory.TestingFramework/Generated/Models/AzureFileStorageWriteSettings.Serialization.cs
@@ -59,8 +59,8 @@ internal static AzureFileStorageWriteSettings DeserializeAzureFileStorageWriteSe
             Optional<DataFactoryElement<int>> maxConcurrentConnections = default;
             Optional<DataFactoryElement<bool>> disableMetricsCollection = default;
             Optional<BinaryData> copyBehavior = default;
-            IDictionary<string, BinaryData> additionalProperties = default;
-            Dictionary<string, BinaryData> additionalPropertiesDictionary = new Dictionary<string, BinaryData>();
+            IDictionary<string, DataFactoryElement<string>> additionalProperties = default;
+            Dictionary<string, DataFactoryElement<string>> additionalPropertiesDictionary = new Dictionary<string, DataFactoryElement<string>>();
             foreach (var property in element.EnumerateObject())
             {
                 if (property.NameEquals("type"u8))
@@ -95,7 +95,7 @@ internal static AzureFileStorageWriteSettings DeserializeAzureFileStorageWriteSe
                     copyBehavior = BinaryData.FromString(property.Value.GetRawText());
                     continue;
                 }
-                additionalPropertiesDictionary.Add(property.Name, BinaryData.FromString(property.Value.GetRawText()));
+                additionalPropertiesDictionary.Add(property.Name, JsonSerializer.Deserialize<DataFactoryElement<string>>(property.Value.GetRawText()));
             }
             additionalProperties = additionalPropertiesDictionary;
             return new AzureFileStorageWriteSettings(type, maxConcurrentConnections.Value, disableMetricsCollection.Value, copyBehavior.Value, additionalProperties);
diff --git a/src/AzureDataFactory.TestingFramework/Generated/Models/AzureFileStorageWriteSettings.cs b/src/AzureDataFactory.TestingFramework/Generated/Models/AzureFileStorageWriteSettings.cs
index 05ac1566..e2d86680 100644
--- a/src/AzureDataFactory.TestingFramework/Generated/Models/AzureFileStorageWriteSettings.cs
+++ b/src/AzureDataFactory.TestingFramework/Generated/Models/AzureFileStorageWriteSettings.cs
@@ -24,7 +24,7 @@ public AzureFileStorageWriteSettings()
         /// <param name="disableMetricsCollection"> If true, disable data store metrics collection. Default is false. Type: boolean (or Expression with resultType boolean). </param>
         /// <param name="copyBehavior"> The type of copy behavior for copy sink. </param>
         /// <param name="additionalProperties"> Additional Properties. </param>
-        internal AzureFileStorageWriteSettings(string storeWriteSettingsType, DataFactoryElement<int> maxConcurrentConnections, DataFactoryElement<bool> disableMetricsCollection, BinaryData copyBehavior, IDictionary<string, BinaryData> additionalProperties) : base(storeWriteSettingsType, maxConcurrentConnections, disableMetricsCollection, copyBehavior, additionalProperties)
+        internal AzureFileStorageWriteSettings(string storeWriteSettingsType, DataFactoryElement<int> maxConcurrentConnections, DataFactoryElement<bool> disableMetricsCollection, BinaryData copyBehavior, IDictionary<string, DataFactoryElement<string>> additionalProperties) : base(storeWriteSettingsType, maxConcurrentConnections, disableMetricsCollection, copyBehavior, additionalProperties)
         {
             StoreWriteSettingsType = storeWriteSettingsType ?? "AzureFileStorageWriteSettings";
         }
diff --git a/src/AzureDataFactory.TestingFramework/Generated/Models/AzureFunctionActivity.Serialization.cs b/src/AzureDataFactory.TestingFramework/Generated/Models/AzureFunctionActivity.Serialization.cs
index 7066e3f6..20fc07ea 100644
--- a/src/AzureDataFactory.TestingFramework/Generated/Models/AzureFunctionActivity.Serialization.cs
+++ b/src/AzureDataFactory.TestingFramework/Generated/Models/AzureFunctionActivity.Serialization.cs
@@ -113,8 +113,8 @@ internal static AzureFunctionActivity DeserializeAzureFunctionActivity(JsonEleme
             DataFactoryElement<string> functionName = default;
             Optional<DataFactoryElement<string>> headers = default;
             Optional<DataFactoryElement<string>> body = default;
-            IDictionary<string, BinaryData> additionalProperties = default;
-            Dictionary<string, BinaryData> additionalPropertiesDictionary = new Dictionary<string, BinaryData>();
+            IDictionary<string, DataFactoryElement<string>> additionalProperties = default;
+            Dictionary<string, DataFactoryElement<string>> additionalPropertiesDictionary = new Dictionary<string, DataFactoryElement<string>>();
             foreach (var property in element.EnumerateObject())
             {
                 if (property.NameEquals("linkedServiceName"u8))
@@ -236,7 +236,7 @@ internal static AzureFunctionActivity DeserializeAzureFunctionActivity(JsonEleme
                     }
                     continue;
                 }
-                additionalPropertiesDictionary.Add(property.Name, BinaryData.FromString(property.Value.GetRawText()));
+                additionalPropertiesDictionary.Add(property.Name, JsonSerializer.Deserialize<DataFactoryElement<string>>(property.Value.GetRawText()));
             }
             additionalProperties = additionalPropertiesDictionary;
             return new AzureFunctionActivity(name, type, description.Value, Optional.ToNullable(state), Optional.ToNullable(onInactiveMarkAs), Optional.ToList(dependsOn), Optional.ToList(userProperties), additionalProperties, linkedServiceName, policy.Value, method, functionName, headers.Value, body.Value);
diff --git a/src/AzureDataFactory.TestingFramework/Generated/Models/AzureFunctionActivity.cs b/src/AzureDataFactory.TestingFramework/Generated/Models/AzureFunctionActivity.cs
index a0f4be6a..cb1ce188 100644
--- a/src/AzureDataFactory.TestingFramework/Generated/Models/AzureFunctionActivity.cs
+++ b/src/AzureDataFactory.TestingFramework/Generated/Models/AzureFunctionActivity.cs
@@ -43,7 +43,7 @@ public AzureFunctionActivity(string name, AzureFunctionActivityMethod method, Da
         /// <param name="functionName"> Name of the Function that the Azure Function Activity will call. Type: string (or Expression with resultType string). </param>
         /// <param name="headers"> Represents the headers that will be sent to the request. For example, to set the language and type on a request: "headers" : { "Accept-Language": "en-us", "Content-Type": "application/json" }. Type: string (or Expression with resultType string). </param>
         /// <param name="body"> Represents the payload that will be sent to the endpoint. Required for POST/PUT method, not allowed for GET method Type: string (or Expression with resultType string). </param>
-        internal AzureFunctionActivity(string name, string activityType, string description, PipelineActivityState? state, ActivityOnInactiveMarkAs? onInactiveMarkAs, IList<PipelineActivityDependency> dependsOn, IList<PipelineActivityUserProperty> userProperties, IDictionary<string, BinaryData> additionalProperties, DataFactoryLinkedServiceReference linkedServiceName, PipelineActivityPolicy policy, AzureFunctionActivityMethod method, DataFactoryElement<string> functionName, DataFactoryElement<string> headers, DataFactoryElement<string> body) : base(name, activityType, description, state, onInactiveMarkAs, dependsOn, userProperties, additionalProperties, linkedServiceName, policy)
+        internal AzureFunctionActivity(string name, string activityType, string description, PipelineActivityState? state, ActivityOnInactiveMarkAs? onInactiveMarkAs, IList<PipelineActivityDependency> dependsOn, IList<PipelineActivityUserProperty> userProperties, IDictionary<string, DataFactoryElement<string>> additionalProperties, DataFactoryLinkedServiceReference linkedServiceName, PipelineActivityPolicy policy, AzureFunctionActivityMethod method, DataFactoryElement<string> functionName, DataFactoryElement<string> headers, DataFactoryElement<string> body) : base(name, activityType, description, state, onInactiveMarkAs, dependsOn, userProperties, additionalProperties, linkedServiceName, policy)
         {
             Method = method;
             FunctionName = functionName;
diff --git a/src/AzureDataFactory.TestingFramework/Generated/Models/AzureFunctionLinkedService.Serialization.cs b/src/AzureDataFactory.TestingFramework/Generated/Models/AzureFunctionLinkedService.Serialization.cs
index 4e66d2b2..91679315 100644
--- a/src/AzureDataFactory.TestingFramework/Generated/Models/AzureFunctionLinkedService.Serialization.cs
+++ b/src/AzureDataFactory.TestingFramework/Generated/Models/AzureFunctionLinkedService.Serialization.cs
@@ -125,8 +125,8 @@ internal static AzureFunctionLinkedService DeserializeAzureFunctionLinkedService
             Optional<DataFactoryCredentialReference> credential = default;
             Optional<BinaryData> resourceId = default;
             Optional<DataFactoryElement<string>> authentication = default;
-            IDictionary<string, BinaryData> additionalProperties = default;
-            Dictionary<string, BinaryData> additionalPropertiesDictionary = new Dictionary<string, BinaryData>();
+            IDictionary<string, DataFactoryElement<string>> additionalProperties = default;
+            Dictionary<string, DataFactoryElement<string>> additionalPropertiesDictionary = new Dictionary<string, DataFactoryElement<string>>();
             foreach (var property in element.EnumerateObject())
             {
                 if (property.NameEquals("type"u8))
@@ -241,7 +241,7 @@ internal static AzureFunctionLinkedService DeserializeAzureFunctionLinkedService
                     }
                     continue;
                 }
-                additionalPropertiesDictionary.Add(property.Name, BinaryData.FromString(property.Value.GetRawText()));
+                additionalPropertiesDictionary.Add(property.Name, JsonSerializer.Deserialize<DataFactoryElement<string>>(property.Value.GetRawText()));
             }
             additionalProperties = additionalPropertiesDictionary;
             return new AzureFunctionLinkedService(type, connectVia.Value, description.Value, Optional.ToDictionary(parameters), Optional.ToList(annotations), additionalProperties, functionAppUrl, functionKey, encryptedCredential.Value, credential.Value, resourceId.Value, authentication.Value);
diff --git a/src/AzureDataFactory.TestingFramework/Generated/Models/AzureFunctionLinkedService.cs b/src/AzureDataFactory.TestingFramework/Generated/Models/AzureFunctionLinkedService.cs
index 9dce4ea7..c7a0cede 100644
--- a/src/AzureDataFactory.TestingFramework/Generated/Models/AzureFunctionLinkedService.cs
+++ b/src/AzureDataFactory.TestingFramework/Generated/Models/AzureFunctionLinkedService.cs
@@ -37,7 +37,7 @@ public AzureFunctionLinkedService(BinaryData functionAppUri)
         /// <param name="credential"> The credential reference containing authentication information. </param>
         /// <param name="resourceId"> Allowed token audiences for azure function. </param>
         /// <param name="authentication"> Type of authentication (Required to specify MSI) used to connect to AzureFunction. Type: string (or Expression with resultType string). </param>
-        internal AzureFunctionLinkedService(string linkedServiceType, IntegrationRuntimeReference connectVia, string description, IDictionary<string, EntityParameterSpecification> parameters, IList<BinaryData> annotations, IDictionary<string, BinaryData> additionalProperties, BinaryData functionAppUri, DataFactorySecretBaseDefinition functionKey, string encryptedCredential, DataFactoryCredentialReference credential, BinaryData resourceId, DataFactoryElement<string> authentication) : base(linkedServiceType, connectVia, description, parameters, annotations, additionalProperties)
+        internal AzureFunctionLinkedService(string linkedServiceType, IntegrationRuntimeReference connectVia, string description, IDictionary<string, EntityParameterSpecification> parameters, IList<BinaryData> annotations, IDictionary<string, DataFactoryElement<string>> additionalProperties, BinaryData functionAppUri, DataFactorySecretBaseDefinition functionKey, string encryptedCredential, DataFactoryCredentialReference credential, BinaryData resourceId, DataFactoryElement<string> authentication) : base(linkedServiceType, connectVia, description, parameters, annotations, additionalProperties)
         {
             FunctionAppUri = functionAppUri;
             FunctionKey = functionKey;
diff --git a/src/AzureDataFactory.TestingFramework/Generated/Models/AzureKeyVaultLinkedService.Serialization.cs b/src/AzureDataFactory.TestingFramework/Generated/Models/AzureKeyVaultLinkedService.Serialization.cs
index 587d954e..82c5efd2 100644
--- a/src/AzureDataFactory.TestingFramework/Generated/Models/AzureKeyVaultLinkedService.Serialization.cs
+++ b/src/AzureDataFactory.TestingFramework/Generated/Models/AzureKeyVaultLinkedService.Serialization.cs
@@ -93,8 +93,8 @@ internal static AzureKeyVaultLinkedService DeserializeAzureKeyVaultLinkedService
             Optional<IList<BinaryData>> annotations = default;
             DataFactoryElement<string> baseUrl = default;
             Optional<DataFactoryCredentialReference> credential = default;
-            IDictionary<string, BinaryData> additionalProperties = default;
-            Dictionary<string, BinaryData> additionalPropertiesDictionary = new Dictionary<string, BinaryData>();
+            IDictionary<string, DataFactoryElement<string>> additionalProperties = default;
+            Dictionary<string, DataFactoryElement<string>> additionalPropertiesDictionary = new Dictionary<string, DataFactoryElement<string>>();
             foreach (var property in element.EnumerateObject())
             {
                 if (property.NameEquals("type"u8))
@@ -177,7 +177,7 @@ internal static AzureKeyVaultLinkedService DeserializeAzureKeyVaultLinkedService
                     }
                     continue;
                 }
-                additionalPropertiesDictionary.Add(property.Name, BinaryData.FromString(property.Value.GetRawText()));
+                additionalPropertiesDictionary.Add(property.Name, JsonSerializer.Deserialize<DataFactoryElement<string>>(property.Value.GetRawText()));
             }
             additionalProperties = additionalPropertiesDictionary;
             return new AzureKeyVaultLinkedService(type, connectVia.Value, description.Value, Optional.ToDictionary(parameters), Optional.ToList(annotations), additionalProperties, baseUrl, credential.Value);
diff --git a/src/AzureDataFactory.TestingFramework/Generated/Models/AzureKeyVaultLinkedService.cs b/src/AzureDataFactory.TestingFramework/Generated/Models/AzureKeyVaultLinkedService.cs
index 95063829..31c39f48 100644
--- a/src/AzureDataFactory.TestingFramework/Generated/Models/AzureKeyVaultLinkedService.cs
+++ b/src/AzureDataFactory.TestingFramework/Generated/Models/AzureKeyVaultLinkedService.cs
@@ -33,7 +33,7 @@ public AzureKeyVaultLinkedService(DataFactoryElement<string> baseUri)
         /// <param name="additionalProperties"> Additional Properties. </param>
         /// <param name="baseUri"> The base URL of the Azure Key Vault. e.g. https://myakv.vault.azure.net Type: string (or Expression with resultType string). </param>
         /// <param name="credential"> The credential reference containing authentication information. </param>
-        internal AzureKeyVaultLinkedService(string linkedServiceType, IntegrationRuntimeReference connectVia, string description, IDictionary<string, EntityParameterSpecification> parameters, IList<BinaryData> annotations, IDictionary<string, BinaryData> additionalProperties, DataFactoryElement<string> baseUri, DataFactoryCredentialReference credential) : base(linkedServiceType, connectVia, description, parameters, annotations, additionalProperties)
+        internal AzureKeyVaultLinkedService(string linkedServiceType, IntegrationRuntimeReference connectVia, string description, IDictionary<string, EntityParameterSpecification> parameters, IList<BinaryData> annotations, IDictionary<string, DataFactoryElement<string>> additionalProperties, DataFactoryElement<string> baseUri, DataFactoryCredentialReference credential) : base(linkedServiceType, connectVia, description, parameters, annotations, additionalProperties)
         {
             BaseUri = baseUri;
             Credential = credential;
diff --git a/src/AzureDataFactory.TestingFramework/Generated/Models/AzureMLBatchExecutionActivity.Serialization.cs b/src/AzureDataFactory.TestingFramework/Generated/Models/AzureMLBatchExecutionActivity.Serialization.cs
index c8ca4884..7fa3e5a4 100644
--- a/src/AzureDataFactory.TestingFramework/Generated/Models/AzureMLBatchExecutionActivity.Serialization.cs
+++ b/src/AzureDataFactory.TestingFramework/Generated/Models/AzureMLBatchExecutionActivity.Serialization.cs
@@ -137,11 +137,11 @@ internal static AzureMLBatchExecutionActivity DeserializeAzureMLBatchExecutionAc
             Optional<ActivityOnInactiveMarkAs> onInactiveMarkAs = default;
             Optional<IList<PipelineActivityDependency>> dependsOn = default;
             Optional<IList<PipelineActivityUserProperty>> userProperties = default;
-            Optional<IDictionary<string, BinaryData>> globalParameters = default;
+            Optional<IDictionary<string, DataFactoryElement<string>>> globalParameters = default;
             Optional<IDictionary<string, AzureMLWebServiceFile>> webServiceOutputs = default;
             Optional<IDictionary<string, AzureMLWebServiceFile>> webServiceInputs = default;
-            IDictionary<string, BinaryData> additionalProperties = default;
-            Dictionary<string, BinaryData> additionalPropertiesDictionary = new Dictionary<string, BinaryData>();
+            IDictionary<string, DataFactoryElement<string>> additionalProperties = default;
+            Dictionary<string, DataFactoryElement<string>> additionalPropertiesDictionary = new Dictionary<string, DataFactoryElement<string>>();
             foreach (var property in element.EnumerateObject())
             {
                 if (property.NameEquals("linkedServiceName"u8))
@@ -238,7 +238,7 @@ internal static AzureMLBatchExecutionActivity DeserializeAzureMLBatchExecutionAc
                             {
                                 continue;
                             }
-                            Dictionary<string, BinaryData> dictionary = new Dictionary<string, BinaryData>();
+                            Dictionary<string, DataFactoryElement<string>> dictionary = new Dictionary<string, DataFactoryElement<string>>();
                             foreach (var property1 in property0.Value.EnumerateObject())
                             {
                                 if (property1.Value.ValueKind == JsonValueKind.Null)
@@ -247,7 +247,7 @@ internal static AzureMLBatchExecutionActivity DeserializeAzureMLBatchExecutionAc
                                 }
                                 else
                                 {
-                                    dictionary.Add(property1.Name, BinaryData.FromString(property1.Value.GetRawText()));
+                                    dictionary.Add(property1.Name, JsonSerializer.Deserialize<DataFactoryElement<string>>(property1.Value.GetRawText()));
                                 }
                             }
                             globalParameters = dictionary;
@@ -284,7 +284,7 @@ internal static AzureMLBatchExecutionActivity DeserializeAzureMLBatchExecutionAc
                     }
                     continue;
                 }
-                additionalPropertiesDictionary.Add(property.Name, BinaryData.FromString(property.Value.GetRawText()));
+                additionalPropertiesDictionary.Add(property.Name, JsonSerializer.Deserialize<DataFactoryElement<string>>(property.Value.GetRawText()));
             }
             additionalProperties = additionalPropertiesDictionary;
             return new AzureMLBatchExecutionActivity(name, type, description.Value, Optional.ToNullable(state), Optional.ToNullable(onInactiveMarkAs), Optional.ToList(dependsOn), Optional.ToList(userProperties), additionalProperties, linkedServiceName, policy.Value, Optional.ToDictionary(globalParameters), Optional.ToDictionary(webServiceOutputs), Optional.ToDictionary(webServiceInputs));
diff --git a/src/AzureDataFactory.TestingFramework/Generated/Models/AzureMLBatchExecutionActivity.cs b/src/AzureDataFactory.TestingFramework/Generated/Models/AzureMLBatchExecutionActivity.cs
index 4a5c6a09..0b9c402a 100644
--- a/src/AzureDataFactory.TestingFramework/Generated/Models/AzureMLBatchExecutionActivity.cs
+++ b/src/AzureDataFactory.TestingFramework/Generated/Models/AzureMLBatchExecutionActivity.cs
@@ -20,7 +20,7 @@ public AzureMLBatchExecutionActivity(string name) : base(name)
         {
             Argument.AssertNotNull(name, nameof(name));
 
-            GlobalParameters = new ChangeTrackingDictionary<string, BinaryData>();
+            GlobalParameters = new ChangeTrackingDictionary<string, DataFactoryElement<string>>();
             WebServiceOutputs = new ChangeTrackingDictionary<string, AzureMLWebServiceFile>();
             WebServiceInputs = new ChangeTrackingDictionary<string, AzureMLWebServiceFile>();
             ActivityType = "AzureMLBatchExecution";
@@ -40,7 +40,7 @@ public AzureMLBatchExecutionActivity(string name) : base(name)
         /// <param name="globalParameters"> Key,Value pairs to be passed to the Azure ML Batch Execution Service endpoint. Keys must match the names of web service parameters defined in the published Azure ML web service. Values will be passed in the GlobalParameters property of the Azure ML batch execution request. </param>
         /// <param name="webServiceOutputs"> Key,Value pairs, mapping the names of Azure ML endpoint's Web Service Outputs to AzureMLWebServiceFile objects specifying the output Blob locations. This information will be passed in the WebServiceOutputs property of the Azure ML batch execution request. </param>
         /// <param name="webServiceInputs"> Key,Value pairs, mapping the names of Azure ML endpoint's Web Service Inputs to AzureMLWebServiceFile objects specifying the input Blob locations.. This information will be passed in the WebServiceInputs property of the Azure ML batch execution request. </param>
-        internal AzureMLBatchExecutionActivity(string name, string activityType, string description, PipelineActivityState? state, ActivityOnInactiveMarkAs? onInactiveMarkAs, IList<PipelineActivityDependency> dependsOn, IList<PipelineActivityUserProperty> userProperties, IDictionary<string, BinaryData> additionalProperties, DataFactoryLinkedServiceReference linkedServiceName, PipelineActivityPolicy policy, IDictionary<string, BinaryData> globalParameters, IDictionary<string, AzureMLWebServiceFile> webServiceOutputs, IDictionary<string, AzureMLWebServiceFile> webServiceInputs) : base(name, activityType, description, state, onInactiveMarkAs, dependsOn, userProperties, additionalProperties, linkedServiceName, policy)
+        internal AzureMLBatchExecutionActivity(string name, string activityType, string description, PipelineActivityState? state, ActivityOnInactiveMarkAs? onInactiveMarkAs, IList<PipelineActivityDependency> dependsOn, IList<PipelineActivityUserProperty> userProperties, IDictionary<string, DataFactoryElement<string>> additionalProperties, DataFactoryLinkedServiceReference linkedServiceName, PipelineActivityPolicy policy, IDictionary<string, DataFactoryElement<string>> globalParameters, IDictionary<string, AzureMLWebServiceFile> webServiceOutputs, IDictionary<string, AzureMLWebServiceFile> webServiceInputs) : base(name, activityType, description, state, onInactiveMarkAs, dependsOn, userProperties, additionalProperties, linkedServiceName, policy)
         {
             GlobalParameters = globalParameters;
             WebServiceOutputs = webServiceOutputs;
@@ -78,7 +78,7 @@ internal AzureMLBatchExecutionActivity(string name, string activityType, string
         /// </list>
         /// </para>
         /// </summary>
-        public IDictionary<string, BinaryData> GlobalParameters { get; }
+        public IDictionary<string, DataFactoryElement<string>> GlobalParameters { get; }
         /// <summary> Key,Value pairs, mapping the names of Azure ML endpoint's Web Service Outputs to AzureMLWebServiceFile objects specifying the output Blob locations. This information will be passed in the WebServiceOutputs property of the Azure ML batch execution request. </summary>
         public IDictionary<string, AzureMLWebServiceFile> WebServiceOutputs { get; }
         /// <summary> Key,Value pairs, mapping the names of Azure ML endpoint's Web Service Inputs to AzureMLWebServiceFile objects specifying the input Blob locations.. This information will be passed in the WebServiceInputs property of the Azure ML batch execution request. </summary>
diff --git a/src/AzureDataFactory.TestingFramework/Generated/Models/AzureMLExecutePipelineActivity.Serialization.cs b/src/AzureDataFactory.TestingFramework/Generated/Models/AzureMLExecutePipelineActivity.Serialization.cs
index c4ca16f7..ac75dbab 100644
--- a/src/AzureDataFactory.TestingFramework/Generated/Models/AzureMLExecutePipelineActivity.Serialization.cs
+++ b/src/AzureDataFactory.TestingFramework/Generated/Models/AzureMLExecutePipelineActivity.Serialization.cs
@@ -143,8 +143,8 @@ internal static AzureMLExecutePipelineActivity DeserializeAzureMLExecutePipeline
             Optional<DataFactoryElement<IDictionary<string, string>>> dataPathAssignments = default;
             Optional<DataFactoryElement<string>> mlParentRunId = default;
             Optional<DataFactoryElement<bool>> continueOnStepFailure = default;
-            IDictionary<string, BinaryData> additionalProperties = default;
-            Dictionary<string, BinaryData> additionalPropertiesDictionary = new Dictionary<string, BinaryData>();
+            IDictionary<string, DataFactoryElement<string>> additionalProperties = default;
+            Dictionary<string, DataFactoryElement<string>> additionalPropertiesDictionary = new Dictionary<string, DataFactoryElement<string>>();
             foreach (var property in element.EnumerateObject())
             {
                 if (property.NameEquals("linkedServiceName"u8))
@@ -310,7 +310,7 @@ internal static AzureMLExecutePipelineActivity DeserializeAzureMLExecutePipeline
                     }
                     continue;
                 }
-                additionalPropertiesDictionary.Add(property.Name, BinaryData.FromString(property.Value.GetRawText()));
+                additionalPropertiesDictionary.Add(property.Name, JsonSerializer.Deserialize<DataFactoryElement<string>>(property.Value.GetRawText()));
             }
             additionalProperties = additionalPropertiesDictionary;
             return new AzureMLExecutePipelineActivity(name, type, description.Value, Optional.ToNullable(state), Optional.ToNullable(onInactiveMarkAs), Optional.ToList(dependsOn), Optional.ToList(userProperties), additionalProperties, linkedServiceName, policy.Value, mlPipelineId.Value, mlPipelineEndpointId.Value, version.Value, experimentName.Value, mlPipelineParameters.Value, dataPathAssignments.Value, mlParentRunId.Value, continueOnStepFailure.Value);
diff --git a/src/AzureDataFactory.TestingFramework/Generated/Models/AzureMLExecutePipelineActivity.cs b/src/AzureDataFactory.TestingFramework/Generated/Models/AzureMLExecutePipelineActivity.cs
index 81caa670..2eecf989 100644
--- a/src/AzureDataFactory.TestingFramework/Generated/Models/AzureMLExecutePipelineActivity.cs
+++ b/src/AzureDataFactory.TestingFramework/Generated/Models/AzureMLExecutePipelineActivity.cs
@@ -42,7 +42,7 @@ public AzureMLExecutePipelineActivity(string name) : base(name)
         /// <param name="dataPathAssignments"> Dictionary used for changing data path assignments without retraining. Values will be passed in the dataPathAssignments property of the published pipeline execution request. Type: object with key value pairs (or Expression with resultType object). </param>
         /// <param name="mlParentRunId"> The parent Azure ML Service pipeline run id. This information will be passed in the ParentRunId property of the published pipeline execution request. Type: string (or Expression with resultType string). </param>
         /// <param name="continueOnStepFailure"> Whether to continue execution of other steps in the PipelineRun if a step fails. This information will be passed in the continueOnStepFailure property of the published pipeline execution request. Type: boolean (or Expression with resultType boolean). </param>
-        internal AzureMLExecutePipelineActivity(string name, string activityType, string description, PipelineActivityState? state, ActivityOnInactiveMarkAs? onInactiveMarkAs, IList<PipelineActivityDependency> dependsOn, IList<PipelineActivityUserProperty> userProperties, IDictionary<string, BinaryData> additionalProperties, DataFactoryLinkedServiceReference linkedServiceName, PipelineActivityPolicy policy, DataFactoryElement<string> mlPipelineId, DataFactoryElement<string> mlPipelineEndpointId, DataFactoryElement<string> version, DataFactoryElement<string> experimentName, DataFactoryElement<IDictionary<string, string>> mlPipelineParameters, DataFactoryElement<IDictionary<string, string>> dataPathAssignments, DataFactoryElement<string> mlParentRunId, DataFactoryElement<bool> continueOnStepFailure) : base(name, activityType, description, state, onInactiveMarkAs, dependsOn, userProperties, additionalProperties, linkedServiceName, policy)
+        internal AzureMLExecutePipelineActivity(string name, string activityType, string description, PipelineActivityState? state, ActivityOnInactiveMarkAs? onInactiveMarkAs, IList<PipelineActivityDependency> dependsOn, IList<PipelineActivityUserProperty> userProperties, IDictionary<string, DataFactoryElement<string>> additionalProperties, DataFactoryLinkedServiceReference linkedServiceName, PipelineActivityPolicy policy, DataFactoryElement<string> mlPipelineId, DataFactoryElement<string> mlPipelineEndpointId, DataFactoryElement<string> version, DataFactoryElement<string> experimentName, DataFactoryElement<IDictionary<string, string>> mlPipelineParameters, DataFactoryElement<IDictionary<string, string>> dataPathAssignments, DataFactoryElement<string> mlParentRunId, DataFactoryElement<bool> continueOnStepFailure) : base(name, activityType, description, state, onInactiveMarkAs, dependsOn, userProperties, additionalProperties, linkedServiceName, policy)
         {
             MLPipelineId = mlPipelineId;
             MLPipelineEndpointId = mlPipelineEndpointId;
diff --git a/src/AzureDataFactory.TestingFramework/Generated/Models/AzureMLLinkedService.Serialization.cs b/src/AzureDataFactory.TestingFramework/Generated/Models/AzureMLLinkedService.Serialization.cs
index 39ac7beb..210db938 100644
--- a/src/AzureDataFactory.TestingFramework/Generated/Models/AzureMLLinkedService.Serialization.cs
+++ b/src/AzureDataFactory.TestingFramework/Generated/Models/AzureMLLinkedService.Serialization.cs
@@ -125,8 +125,8 @@ internal static AzureMLLinkedService DeserializeAzureMLLinkedService(JsonElement
             Optional<DataFactoryElement<string>> tenant = default;
             Optional<string> encryptedCredential = default;
             Optional<DataFactoryElement<string>> authentication = default;
-            IDictionary<string, BinaryData> additionalProperties = default;
-            Dictionary<string, BinaryData> additionalPropertiesDictionary = new Dictionary<string, BinaryData>();
+            IDictionary<string, DataFactoryElement<string>> additionalProperties = default;
+            Dictionary<string, DataFactoryElement<string>> additionalPropertiesDictionary = new Dictionary<string, DataFactoryElement<string>>();
             foreach (var property in element.EnumerateObject())
             {
                 if (property.NameEquals("type"u8))
@@ -255,7 +255,7 @@ internal static AzureMLLinkedService DeserializeAzureMLLinkedService(JsonElement
                     }
                     continue;
                 }
-                additionalPropertiesDictionary.Add(property.Name, BinaryData.FromString(property.Value.GetRawText()));
+                additionalPropertiesDictionary.Add(property.Name, JsonSerializer.Deserialize<DataFactoryElement<string>>(property.Value.GetRawText()));
             }
             additionalProperties = additionalPropertiesDictionary;
             return new AzureMLLinkedService(type, connectVia.Value, description.Value, Optional.ToDictionary(parameters), Optional.ToList(annotations), additionalProperties, mlEndpoint, apiKey, updateResourceEndpoint.Value, servicePrincipalId.Value, servicePrincipalKey, tenant.Value, encryptedCredential.Value, authentication.Value);
diff --git a/src/AzureDataFactory.TestingFramework/Generated/Models/AzureMLLinkedService.cs b/src/AzureDataFactory.TestingFramework/Generated/Models/AzureMLLinkedService.cs
index 46c53803..63d87338 100644
--- a/src/AzureDataFactory.TestingFramework/Generated/Models/AzureMLLinkedService.cs
+++ b/src/AzureDataFactory.TestingFramework/Generated/Models/AzureMLLinkedService.cs
@@ -42,7 +42,7 @@ public AzureMLLinkedService(DataFactoryElement<string> mlEndpoint, DataFactorySe
         /// <param name="tenant"> The name or ID of the tenant to which the service principal belongs. Type: string (or Expression with resultType string). </param>
         /// <param name="encryptedCredential"> The encrypted credential used for authentication. Credentials are encrypted using the integration runtime credential manager. Type: string. </param>
         /// <param name="authentication"> Type of authentication (Required to specify MSI) used to connect to AzureML. Type: string (or Expression with resultType string). </param>
-        internal AzureMLLinkedService(string linkedServiceType, IntegrationRuntimeReference connectVia, string description, IDictionary<string, EntityParameterSpecification> parameters, IList<BinaryData> annotations, IDictionary<string, BinaryData> additionalProperties, DataFactoryElement<string> mlEndpoint, DataFactorySecretBaseDefinition apiKey, DataFactoryElement<string> updateResourceEndpoint, DataFactoryElement<string> servicePrincipalId, DataFactorySecretBaseDefinition servicePrincipalKey, DataFactoryElement<string> tenant, string encryptedCredential, DataFactoryElement<string> authentication) : base(linkedServiceType, connectVia, description, parameters, annotations, additionalProperties)
+        internal AzureMLLinkedService(string linkedServiceType, IntegrationRuntimeReference connectVia, string description, IDictionary<string, EntityParameterSpecification> parameters, IList<BinaryData> annotations, IDictionary<string, DataFactoryElement<string>> additionalProperties, DataFactoryElement<string> mlEndpoint, DataFactorySecretBaseDefinition apiKey, DataFactoryElement<string> updateResourceEndpoint, DataFactoryElement<string> servicePrincipalId, DataFactorySecretBaseDefinition servicePrincipalKey, DataFactoryElement<string> tenant, string encryptedCredential, DataFactoryElement<string> authentication) : base(linkedServiceType, connectVia, description, parameters, annotations, additionalProperties)
         {
             MLEndpoint = mlEndpoint;
             ApiKey = apiKey;
diff --git a/src/AzureDataFactory.TestingFramework/Generated/Models/AzureMLServiceLinkedService.Serialization.cs b/src/AzureDataFactory.TestingFramework/Generated/Models/AzureMLServiceLinkedService.Serialization.cs
index af956070..ac230790 100644
--- a/src/AzureDataFactory.TestingFramework/Generated/Models/AzureMLServiceLinkedService.Serialization.cs
+++ b/src/AzureDataFactory.TestingFramework/Generated/Models/AzureMLServiceLinkedService.Serialization.cs
@@ -123,8 +123,8 @@ internal static AzureMLServiceLinkedService DeserializeAzureMLServiceLinkedServi
             Optional<DataFactorySecretBaseDefinition> servicePrincipalKey = default;
             Optional<DataFactoryElement<string>> tenant = default;
             Optional<string> encryptedCredential = default;
-            IDictionary<string, BinaryData> additionalProperties = default;
-            Dictionary<string, BinaryData> additionalPropertiesDictionary = new Dictionary<string, BinaryData>();
+            IDictionary<string, DataFactoryElement<string>> additionalProperties = default;
+            Dictionary<string, DataFactoryElement<string>> additionalPropertiesDictionary = new Dictionary<string, DataFactoryElement<string>>();
             foreach (var property in element.EnumerateObject())
             {
                 if (property.NameEquals("type"u8))
@@ -249,7 +249,7 @@ internal static AzureMLServiceLinkedService DeserializeAzureMLServiceLinkedServi
                     }
                     continue;
                 }
-                additionalPropertiesDictionary.Add(property.Name, BinaryData.FromString(property.Value.GetRawText()));
+                additionalPropertiesDictionary.Add(property.Name, JsonSerializer.Deserialize<DataFactoryElement<string>>(property.Value.GetRawText()));
             }
             additionalProperties = additionalPropertiesDictionary;
             return new AzureMLServiceLinkedService(type, connectVia.Value, description.Value, Optional.ToDictionary(parameters), Optional.ToList(annotations), additionalProperties, subscriptionId, resourceGroupName, mlWorkspaceName, authentication.Value, servicePrincipalId.Value, servicePrincipalKey, tenant.Value, encryptedCredential.Value);
diff --git a/src/AzureDataFactory.TestingFramework/Generated/Models/AzureMLServiceLinkedService.cs b/src/AzureDataFactory.TestingFramework/Generated/Models/AzureMLServiceLinkedService.cs
index e6da271e..5f04c178 100644
--- a/src/AzureDataFactory.TestingFramework/Generated/Models/AzureMLServiceLinkedService.cs
+++ b/src/AzureDataFactory.TestingFramework/Generated/Models/AzureMLServiceLinkedService.cs
@@ -45,7 +45,7 @@ public AzureMLServiceLinkedService(DataFactoryElement<string> subscriptionId, Da
         /// <param name="servicePrincipalKey"> The key of the service principal used to authenticate against the endpoint of a published Azure ML Service pipeline. </param>
         /// <param name="tenant"> The name or ID of the tenant to which the service principal belongs. Type: string (or Expression with resultType string). </param>
         /// <param name="encryptedCredential"> The encrypted credential used for authentication. Credentials are encrypted using the integration runtime credential manager. Type: string. </param>
-        internal AzureMLServiceLinkedService(string linkedServiceType, IntegrationRuntimeReference connectVia, string description, IDictionary<string, EntityParameterSpecification> parameters, IList<BinaryData> annotations, IDictionary<string, BinaryData> additionalProperties, DataFactoryElement<string> subscriptionId, DataFactoryElement<string> resourceGroupName, DataFactoryElement<string> mlWorkspaceName, DataFactoryElement<string> authentication, DataFactoryElement<string> servicePrincipalId, DataFactorySecretBaseDefinition servicePrincipalKey, DataFactoryElement<string> tenant, string encryptedCredential) : base(linkedServiceType, connectVia, description, parameters, annotations, additionalProperties)
+        internal AzureMLServiceLinkedService(string linkedServiceType, IntegrationRuntimeReference connectVia, string description, IDictionary<string, EntityParameterSpecification> parameters, IList<BinaryData> annotations, IDictionary<string, DataFactoryElement<string>> additionalProperties, DataFactoryElement<string> subscriptionId, DataFactoryElement<string> resourceGroupName, DataFactoryElement<string> mlWorkspaceName, DataFactoryElement<string> authentication, DataFactoryElement<string> servicePrincipalId, DataFactorySecretBaseDefinition servicePrincipalKey, DataFactoryElement<string> tenant, string encryptedCredential) : base(linkedServiceType, connectVia, description, parameters, annotations, additionalProperties)
         {
             SubscriptionId = subscriptionId;
             ResourceGroupName = resourceGroupName;
diff --git a/src/AzureDataFactory.TestingFramework/Generated/Models/AzureMLUpdateResourceActivity.Serialization.cs b/src/AzureDataFactory.TestingFramework/Generated/Models/AzureMLUpdateResourceActivity.Serialization.cs
index 360bf73f..498e4608 100644
--- a/src/AzureDataFactory.TestingFramework/Generated/Models/AzureMLUpdateResourceActivity.Serialization.cs
+++ b/src/AzureDataFactory.TestingFramework/Generated/Models/AzureMLUpdateResourceActivity.Serialization.cs
@@ -103,8 +103,8 @@ internal static AzureMLUpdateResourceActivity DeserializeAzureMLUpdateResourceAc
             DataFactoryElement<string> trainedModelName = default;
             DataFactoryLinkedServiceReference trainedModelLinkedServiceName = default;
             DataFactoryElement<string> trainedModelFilePath = default;
-            IDictionary<string, BinaryData> additionalProperties = default;
-            Dictionary<string, BinaryData> additionalPropertiesDictionary = new Dictionary<string, BinaryData>();
+            IDictionary<string, DataFactoryElement<string>> additionalProperties = default;
+            Dictionary<string, DataFactoryElement<string>> additionalPropertiesDictionary = new Dictionary<string, DataFactoryElement<string>>();
             foreach (var property in element.EnumerateObject())
             {
                 if (property.NameEquals("linkedServiceName"u8))
@@ -213,7 +213,7 @@ internal static AzureMLUpdateResourceActivity DeserializeAzureMLUpdateResourceAc
                     }
                     continue;
                 }
-                additionalPropertiesDictionary.Add(property.Name, BinaryData.FromString(property.Value.GetRawText()));
+                additionalPropertiesDictionary.Add(property.Name, JsonSerializer.Deserialize<DataFactoryElement<string>>(property.Value.GetRawText()));
             }
             additionalProperties = additionalPropertiesDictionary;
             return new AzureMLUpdateResourceActivity(name, type, description.Value, Optional.ToNullable(state), Optional.ToNullable(onInactiveMarkAs), Optional.ToList(dependsOn), Optional.ToList(userProperties), additionalProperties, linkedServiceName, policy.Value, trainedModelName, trainedModelLinkedServiceName, trainedModelFilePath);
diff --git a/src/AzureDataFactory.TestingFramework/Generated/Models/AzureMLUpdateResourceActivity.cs b/src/AzureDataFactory.TestingFramework/Generated/Models/AzureMLUpdateResourceActivity.cs
index dcfac939..ef774283 100644
--- a/src/AzureDataFactory.TestingFramework/Generated/Models/AzureMLUpdateResourceActivity.cs
+++ b/src/AzureDataFactory.TestingFramework/Generated/Models/AzureMLUpdateResourceActivity.cs
@@ -46,7 +46,7 @@ public AzureMLUpdateResourceActivity(string name, DataFactoryElement<string> tra
         /// <param name="trainedModelName"> Name of the Trained Model module in the Web Service experiment to be updated. Type: string (or Expression with resultType string). </param>
         /// <param name="trainedModelLinkedServiceName"> Name of Azure Storage linked service holding the .ilearner file that will be uploaded by the update operation. </param>
         /// <param name="trainedModelFilePath"> The relative file path in trainedModelLinkedService to represent the .ilearner file that will be uploaded by the update operation.  Type: string (or Expression with resultType string). </param>
-        internal AzureMLUpdateResourceActivity(string name, string activityType, string description, PipelineActivityState? state, ActivityOnInactiveMarkAs? onInactiveMarkAs, IList<PipelineActivityDependency> dependsOn, IList<PipelineActivityUserProperty> userProperties, IDictionary<string, BinaryData> additionalProperties, DataFactoryLinkedServiceReference linkedServiceName, PipelineActivityPolicy policy, DataFactoryElement<string> trainedModelName, DataFactoryLinkedServiceReference trainedModelLinkedServiceName, DataFactoryElement<string> trainedModelFilePath) : base(name, activityType, description, state, onInactiveMarkAs, dependsOn, userProperties, additionalProperties, linkedServiceName, policy)
+        internal AzureMLUpdateResourceActivity(string name, string activityType, string description, PipelineActivityState? state, ActivityOnInactiveMarkAs? onInactiveMarkAs, IList<PipelineActivityDependency> dependsOn, IList<PipelineActivityUserProperty> userProperties, IDictionary<string, DataFactoryElement<string>> additionalProperties, DataFactoryLinkedServiceReference linkedServiceName, PipelineActivityPolicy policy, DataFactoryElement<string> trainedModelName, DataFactoryLinkedServiceReference trainedModelLinkedServiceName, DataFactoryElement<string> trainedModelFilePath) : base(name, activityType, description, state, onInactiveMarkAs, dependsOn, userProperties, additionalProperties, linkedServiceName, policy)
         {
             TrainedModelName = trainedModelName;
             TrainedModelLinkedServiceName = trainedModelLinkedServiceName;
diff --git a/src/AzureDataFactory.TestingFramework/Generated/Models/AzureMariaDBLinkedService.Serialization.cs b/src/AzureDataFactory.TestingFramework/Generated/Models/AzureMariaDBLinkedService.Serialization.cs
index d45c2c70..40999238 100644
--- a/src/AzureDataFactory.TestingFramework/Generated/Models/AzureMariaDBLinkedService.Serialization.cs
+++ b/src/AzureDataFactory.TestingFramework/Generated/Models/AzureMariaDBLinkedService.Serialization.cs
@@ -102,8 +102,8 @@ internal static AzureMariaDBLinkedService DeserializeAzureMariaDBLinkedService(J
             Optional<DataFactoryElement<string>> connectionString = default;
             Optional<DataFactoryKeyVaultSecretReference> password = default;
             Optional<string> encryptedCredential = default;
-            IDictionary<string, BinaryData> additionalProperties = default;
-            Dictionary<string, BinaryData> additionalPropertiesDictionary = new Dictionary<string, BinaryData>();
+            IDictionary<string, DataFactoryElement<string>> additionalProperties = default;
+            Dictionary<string, DataFactoryElement<string>> additionalPropertiesDictionary = new Dictionary<string, DataFactoryElement<string>>();
             foreach (var property in element.EnumerateObject())
             {
                 if (property.NameEquals("type"u8))
@@ -195,7 +195,7 @@ internal static AzureMariaDBLinkedService DeserializeAzureMariaDBLinkedService(J
                     }
                     continue;
                 }
-                additionalPropertiesDictionary.Add(property.Name, BinaryData.FromString(property.Value.GetRawText()));
+                additionalPropertiesDictionary.Add(property.Name, JsonSerializer.Deserialize<DataFactoryElement<string>>(property.Value.GetRawText()));
             }
             additionalProperties = additionalPropertiesDictionary;
             return new AzureMariaDBLinkedService(type, connectVia.Value, description.Value, Optional.ToDictionary(parameters), Optional.ToList(annotations), additionalProperties, connectionString.Value, password, encryptedCredential.Value);
diff --git a/src/AzureDataFactory.TestingFramework/Generated/Models/AzureMariaDBLinkedService.cs b/src/AzureDataFactory.TestingFramework/Generated/Models/AzureMariaDBLinkedService.cs
index ab576701..825c9a01 100644
--- a/src/AzureDataFactory.TestingFramework/Generated/Models/AzureMariaDBLinkedService.cs
+++ b/src/AzureDataFactory.TestingFramework/Generated/Models/AzureMariaDBLinkedService.cs
@@ -28,7 +28,7 @@ public AzureMariaDBLinkedService()
         /// <param name="connectionString"> An ODBC connection string. Type: string, SecureString or AzureKeyVaultSecretReference. </param>
         /// <param name="password"> The Azure key vault secret reference of password in connection string. </param>
         /// <param name="encryptedCredential"> The encrypted credential used for authentication. Credentials are encrypted using the integration runtime credential manager. Type: string. </param>
-        internal AzureMariaDBLinkedService(string linkedServiceType, IntegrationRuntimeReference connectVia, string description, IDictionary<string, EntityParameterSpecification> parameters, IList<BinaryData> annotations, IDictionary<string, BinaryData> additionalProperties, DataFactoryElement<string> connectionString, DataFactoryKeyVaultSecretReference password, string encryptedCredential) : base(linkedServiceType, connectVia, description, parameters, annotations, additionalProperties)
+        internal AzureMariaDBLinkedService(string linkedServiceType, IntegrationRuntimeReference connectVia, string description, IDictionary<string, EntityParameterSpecification> parameters, IList<BinaryData> annotations, IDictionary<string, DataFactoryElement<string>> additionalProperties, DataFactoryElement<string> connectionString, DataFactoryKeyVaultSecretReference password, string encryptedCredential) : base(linkedServiceType, connectVia, description, parameters, annotations, additionalProperties)
         {
             ConnectionString = connectionString;
             Password = password;
diff --git a/src/AzureDataFactory.TestingFramework/Generated/Models/AzureMariaDBSource.Serialization.cs b/src/AzureDataFactory.TestingFramework/Generated/Models/AzureMariaDBSource.Serialization.cs
index e942120e..4ca74c1d 100644
--- a/src/AzureDataFactory.TestingFramework/Generated/Models/AzureMariaDBSource.Serialization.cs
+++ b/src/AzureDataFactory.TestingFramework/Generated/Models/AzureMariaDBSource.Serialization.cs
@@ -83,8 +83,8 @@ internal static AzureMariaDBSource DeserializeAzureMariaDBSource(JsonElement ele
             Optional<DataFactoryElement<string>> sourceRetryWait = default;
             Optional<DataFactoryElement<int>> maxConcurrentConnections = default;
             Optional<DataFactoryElement<bool>> disableMetricsCollection = default;
-            IDictionary<string, BinaryData> additionalProperties = default;
-            Dictionary<string, BinaryData> additionalPropertiesDictionary = new Dictionary<string, BinaryData>();
+            IDictionary<string, DataFactoryElement<string>> additionalProperties = default;
+            Dictionary<string, DataFactoryElement<string>> additionalPropertiesDictionary = new Dictionary<string, DataFactoryElement<string>>();
             foreach (var property in element.EnumerateObject())
             {
                 if (property.NameEquals("query"u8))
@@ -155,7 +155,7 @@ internal static AzureMariaDBSource DeserializeAzureMariaDBSource(JsonElement ele
                     disableMetricsCollection = JsonSerializer.Deserialize<DataFactoryElement<bool>>(property.Value.GetRawText());
                     continue;
                 }
-                additionalPropertiesDictionary.Add(property.Name, BinaryData.FromString(property.Value.GetRawText()));
+                additionalPropertiesDictionary.Add(property.Name, JsonSerializer.Deserialize<DataFactoryElement<string>>(property.Value.GetRawText()));
             }
             additionalProperties = additionalPropertiesDictionary;
             return new AzureMariaDBSource(type, sourceRetryCount.Value, sourceRetryWait.Value, maxConcurrentConnections.Value, disableMetricsCollection.Value, additionalProperties, queryTimeout.Value, additionalColumns.Value, query.Value);
diff --git a/src/AzureDataFactory.TestingFramework/Generated/Models/AzureMariaDBSource.cs b/src/AzureDataFactory.TestingFramework/Generated/Models/AzureMariaDBSource.cs
index a7e23ad5..6fce4ab4 100644
--- a/src/AzureDataFactory.TestingFramework/Generated/Models/AzureMariaDBSource.cs
+++ b/src/AzureDataFactory.TestingFramework/Generated/Models/AzureMariaDBSource.cs
@@ -28,7 +28,7 @@ public AzureMariaDBSource()
         /// <param name="queryTimeout"> Query timeout. Type: string (or Expression with resultType string), pattern: ((\d+)\.)?(\d\d):(60|([0-5][0-9])):(60|([0-5][0-9])). </param>
         /// <param name="additionalColumns"> Specifies the additional columns to be added to source data. Type: array of objects(AdditionalColumns) (or Expression with resultType array of objects). </param>
         /// <param name="query"> A query to retrieve data from source. Type: string (or Expression with resultType string). </param>
-        internal AzureMariaDBSource(string copySourceType, DataFactoryElement<int> sourceRetryCount, DataFactoryElement<string> sourceRetryWait, DataFactoryElement<int> maxConcurrentConnections, DataFactoryElement<bool> disableMetricsCollection, IDictionary<string, BinaryData> additionalProperties, DataFactoryElement<string> queryTimeout, BinaryData additionalColumns, DataFactoryElement<string> query) : base(copySourceType, sourceRetryCount, sourceRetryWait, maxConcurrentConnections, disableMetricsCollection, additionalProperties, queryTimeout, additionalColumns)
+        internal AzureMariaDBSource(string copySourceType, DataFactoryElement<int> sourceRetryCount, DataFactoryElement<string> sourceRetryWait, DataFactoryElement<int> maxConcurrentConnections, DataFactoryElement<bool> disableMetricsCollection, IDictionary<string, DataFactoryElement<string>> additionalProperties, DataFactoryElement<string> queryTimeout, BinaryData additionalColumns, DataFactoryElement<string> query) : base(copySourceType, sourceRetryCount, sourceRetryWait, maxConcurrentConnections, disableMetricsCollection, additionalProperties, queryTimeout, additionalColumns)
         {
             Query = query;
             CopySourceType = copySourceType ?? "AzureMariaDBSource";
diff --git a/src/AzureDataFactory.TestingFramework/Generated/Models/AzureMariaDBTableDataset.Serialization.cs b/src/AzureDataFactory.TestingFramework/Generated/Models/AzureMariaDBTableDataset.Serialization.cs
index eefcad99..6c3d01ee 100644
--- a/src/AzureDataFactory.TestingFramework/Generated/Models/AzureMariaDBTableDataset.Serialization.cs
+++ b/src/AzureDataFactory.TestingFramework/Generated/Models/AzureMariaDBTableDataset.Serialization.cs
@@ -104,8 +104,8 @@ internal static AzureMariaDBTableDataset DeserializeAzureMariaDBTableDataset(Jso
             Optional<IList<BinaryData>> annotations = default;
             Optional<DatasetFolder> folder = default;
             Optional<DataFactoryElement<string>> tableName = default;
-            IDictionary<string, BinaryData> additionalProperties = default;
-            Dictionary<string, BinaryData> additionalPropertiesDictionary = new Dictionary<string, BinaryData>();
+            IDictionary<string, DataFactoryElement<string>> additionalProperties = default;
+            Dictionary<string, DataFactoryElement<string>> additionalPropertiesDictionary = new Dictionary<string, DataFactoryElement<string>>();
             foreach (var property in element.EnumerateObject())
             {
                 if (property.NameEquals("type"u8))
@@ -206,7 +206,7 @@ internal static AzureMariaDBTableDataset DeserializeAzureMariaDBTableDataset(Jso
                     }
                     continue;
                 }
-                additionalPropertiesDictionary.Add(property.Name, BinaryData.FromString(property.Value.GetRawText()));
+                additionalPropertiesDictionary.Add(property.Name, JsonSerializer.Deserialize<DataFactoryElement<string>>(property.Value.GetRawText()));
             }
             additionalProperties = additionalPropertiesDictionary;
             return new AzureMariaDBTableDataset(type, description.Value, structure.Value, schema.Value, linkedServiceName, Optional.ToDictionary(parameters), Optional.ToList(annotations), folder.Value, additionalProperties, tableName.Value);
diff --git a/src/AzureDataFactory.TestingFramework/Generated/Models/AzureMariaDBTableDataset.cs b/src/AzureDataFactory.TestingFramework/Generated/Models/AzureMariaDBTableDataset.cs
index 5f01e18b..5ad83fef 100644
--- a/src/AzureDataFactory.TestingFramework/Generated/Models/AzureMariaDBTableDataset.cs
+++ b/src/AzureDataFactory.TestingFramework/Generated/Models/AzureMariaDBTableDataset.cs
@@ -34,7 +34,7 @@ public AzureMariaDBTableDataset(DataFactoryLinkedServiceReference linkedServiceN
         /// <param name="folder"> The folder that this Dataset is in. If not specified, Dataset will appear at the root level. </param>
         /// <param name="additionalProperties"> Additional Properties. </param>
         /// <param name="tableName"> The table name. Type: string (or Expression with resultType string). </param>
-        internal AzureMariaDBTableDataset(string datasetType, string description, DataFactoryElement<IList<DatasetDataElement>> structure, DataFactoryElement<IList<DatasetSchemaDataElement>> schema, DataFactoryLinkedServiceReference linkedServiceName, IDictionary<string, EntityParameterSpecification> parameters, IList<BinaryData> annotations, DatasetFolder folder, IDictionary<string, BinaryData> additionalProperties, DataFactoryElement<string> tableName) : base(datasetType, description, structure, schema, linkedServiceName, parameters, annotations, folder, additionalProperties)
+        internal AzureMariaDBTableDataset(string datasetType, string description, DataFactoryElement<IList<DatasetDataElement>> structure, DataFactoryElement<IList<DatasetSchemaDataElement>> schema, DataFactoryLinkedServiceReference linkedServiceName, IDictionary<string, EntityParameterSpecification> parameters, IList<BinaryData> annotations, DatasetFolder folder, IDictionary<string, DataFactoryElement<string>> additionalProperties, DataFactoryElement<string> tableName) : base(datasetType, description, structure, schema, linkedServiceName, parameters, annotations, folder, additionalProperties)
         {
             TableName = tableName;
             DatasetType = datasetType ?? "AzureMariaDBTable";
diff --git a/src/AzureDataFactory.TestingFramework/Generated/Models/AzureMySqlLinkedService.Serialization.cs b/src/AzureDataFactory.TestingFramework/Generated/Models/AzureMySqlLinkedService.Serialization.cs
index 7785823e..e236c87c 100644
--- a/src/AzureDataFactory.TestingFramework/Generated/Models/AzureMySqlLinkedService.Serialization.cs
+++ b/src/AzureDataFactory.TestingFramework/Generated/Models/AzureMySqlLinkedService.Serialization.cs
@@ -99,8 +99,8 @@ internal static AzureMySqlLinkedService DeserializeAzureMySqlLinkedService(JsonE
             DataFactoryElement<string> connectionString = default;
             Optional<DataFactoryKeyVaultSecretReference> password = default;
             Optional<string> encryptedCredential = default;
-            IDictionary<string, BinaryData> additionalProperties = default;
-            Dictionary<string, BinaryData> additionalPropertiesDictionary = new Dictionary<string, BinaryData>();
+            IDictionary<string, DataFactoryElement<string>> additionalProperties = default;
+            Dictionary<string, DataFactoryElement<string>> additionalPropertiesDictionary = new Dictionary<string, DataFactoryElement<string>>();
             foreach (var property in element.EnumerateObject())
             {
                 if (property.NameEquals("type"u8))
@@ -188,7 +188,7 @@ internal static AzureMySqlLinkedService DeserializeAzureMySqlLinkedService(JsonE
                     }
                     continue;
                 }
-                additionalPropertiesDictionary.Add(property.Name, BinaryData.FromString(property.Value.GetRawText()));
+                additionalPropertiesDictionary.Add(property.Name, JsonSerializer.Deserialize<DataFactoryElement<string>>(property.Value.GetRawText()));
             }
             additionalProperties = additionalPropertiesDictionary;
             return new AzureMySqlLinkedService(type, connectVia.Value, description.Value, Optional.ToDictionary(parameters), Optional.ToList(annotations), additionalProperties, connectionString, password, encryptedCredential.Value);
diff --git a/src/AzureDataFactory.TestingFramework/Generated/Models/AzureMySqlLinkedService.cs b/src/AzureDataFactory.TestingFramework/Generated/Models/AzureMySqlLinkedService.cs
index 5c82c44a..759dd88b 100644
--- a/src/AzureDataFactory.TestingFramework/Generated/Models/AzureMySqlLinkedService.cs
+++ b/src/AzureDataFactory.TestingFramework/Generated/Models/AzureMySqlLinkedService.cs
@@ -34,7 +34,7 @@ public AzureMySqlLinkedService(DataFactoryElement<string> connectionString)
         /// <param name="connectionString"> The connection string. Type: string, SecureString or AzureKeyVaultSecretReference. </param>
         /// <param name="password"> The Azure key vault secret reference of password in connection string. </param>
         /// <param name="encryptedCredential"> The encrypted credential used for authentication. Credentials are encrypted using the integration runtime credential manager. Type: string. </param>
-        internal AzureMySqlLinkedService(string linkedServiceType, IntegrationRuntimeReference connectVia, string description, IDictionary<string, EntityParameterSpecification> parameters, IList<BinaryData> annotations, IDictionary<string, BinaryData> additionalProperties, DataFactoryElement<string> connectionString, DataFactoryKeyVaultSecretReference password, string encryptedCredential) : base(linkedServiceType, connectVia, description, parameters, annotations, additionalProperties)
+        internal AzureMySqlLinkedService(string linkedServiceType, IntegrationRuntimeReference connectVia, string description, IDictionary<string, EntityParameterSpecification> parameters, IList<BinaryData> annotations, IDictionary<string, DataFactoryElement<string>> additionalProperties, DataFactoryElement<string> connectionString, DataFactoryKeyVaultSecretReference password, string encryptedCredential) : base(linkedServiceType, connectVia, description, parameters, annotations, additionalProperties)
         {
             ConnectionString = connectionString;
             Password = password;
diff --git a/src/AzureDataFactory.TestingFramework/Generated/Models/AzureMySqlSink.Serialization.cs b/src/AzureDataFactory.TestingFramework/Generated/Models/AzureMySqlSink.Serialization.cs
index 48e04d41..a1f02bd6 100644
--- a/src/AzureDataFactory.TestingFramework/Generated/Models/AzureMySqlSink.Serialization.cs
+++ b/src/AzureDataFactory.TestingFramework/Generated/Models/AzureMySqlSink.Serialization.cs
@@ -79,8 +79,8 @@ internal static AzureMySqlSink DeserializeAzureMySqlSink(JsonElement element)
             Optional<DataFactoryElement<string>> sinkRetryWait = default;
             Optional<DataFactoryElement<int>> maxConcurrentConnections = default;
             Optional<DataFactoryElement<bool>> disableMetricsCollection = default;
-            IDictionary<string, BinaryData> additionalProperties = default;
-            Dictionary<string, BinaryData> additionalPropertiesDictionary = new Dictionary<string, BinaryData>();
+            IDictionary<string, DataFactoryElement<string>> additionalProperties = default;
+            Dictionary<string, DataFactoryElement<string>> additionalPropertiesDictionary = new Dictionary<string, DataFactoryElement<string>>();
             foreach (var property in element.EnumerateObject())
             {
                 if (property.NameEquals("preCopyScript"u8))
@@ -151,7 +151,7 @@ internal static AzureMySqlSink DeserializeAzureMySqlSink(JsonElement element)
                     disableMetricsCollection = JsonSerializer.Deserialize<DataFactoryElement<bool>>(property.Value.GetRawText());
                     continue;
                 }
-                additionalPropertiesDictionary.Add(property.Name, BinaryData.FromString(property.Value.GetRawText()));
+                additionalPropertiesDictionary.Add(property.Name, JsonSerializer.Deserialize<DataFactoryElement<string>>(property.Value.GetRawText()));
             }
             additionalProperties = additionalPropertiesDictionary;
             return new AzureMySqlSink(type, writeBatchSize.Value, writeBatchTimeout.Value, sinkRetryCount.Value, sinkRetryWait.Value, maxConcurrentConnections.Value, disableMetricsCollection.Value, additionalProperties, preCopyScript.Value);
diff --git a/src/AzureDataFactory.TestingFramework/Generated/Models/AzureMySqlSink.cs b/src/AzureDataFactory.TestingFramework/Generated/Models/AzureMySqlSink.cs
index cbc4cb52..0520ab90 100644
--- a/src/AzureDataFactory.TestingFramework/Generated/Models/AzureMySqlSink.cs
+++ b/src/AzureDataFactory.TestingFramework/Generated/Models/AzureMySqlSink.cs
@@ -28,7 +28,7 @@ public AzureMySqlSink()
         /// <param name="disableMetricsCollection"> If true, disable data store metrics collection. Default is false. Type: boolean (or Expression with resultType boolean). </param>
         /// <param name="additionalProperties"> Additional Properties. </param>
         /// <param name="preCopyScript"> A query to execute before starting the copy. Type: string (or Expression with resultType string). </param>
-        internal AzureMySqlSink(string copySinkType, DataFactoryElement<int> writeBatchSize, DataFactoryElement<string> writeBatchTimeout, DataFactoryElement<int> sinkRetryCount, DataFactoryElement<string> sinkRetryWait, DataFactoryElement<int> maxConcurrentConnections, DataFactoryElement<bool> disableMetricsCollection, IDictionary<string, BinaryData> additionalProperties, DataFactoryElement<string> preCopyScript) : base(copySinkType, writeBatchSize, writeBatchTimeout, sinkRetryCount, sinkRetryWait, maxConcurrentConnections, disableMetricsCollection, additionalProperties)
+        internal AzureMySqlSink(string copySinkType, DataFactoryElement<int> writeBatchSize, DataFactoryElement<string> writeBatchTimeout, DataFactoryElement<int> sinkRetryCount, DataFactoryElement<string> sinkRetryWait, DataFactoryElement<int> maxConcurrentConnections, DataFactoryElement<bool> disableMetricsCollection, IDictionary<string, DataFactoryElement<string>> additionalProperties, DataFactoryElement<string> preCopyScript) : base(copySinkType, writeBatchSize, writeBatchTimeout, sinkRetryCount, sinkRetryWait, maxConcurrentConnections, disableMetricsCollection, additionalProperties)
         {
             PreCopyScript = preCopyScript;
             CopySinkType = copySinkType ?? "AzureMySqlSink";
diff --git a/src/AzureDataFactory.TestingFramework/Generated/Models/AzureMySqlSource.Serialization.cs b/src/AzureDataFactory.TestingFramework/Generated/Models/AzureMySqlSource.Serialization.cs
index eadd8729..c571358a 100644
--- a/src/AzureDataFactory.TestingFramework/Generated/Models/AzureMySqlSource.Serialization.cs
+++ b/src/AzureDataFactory.TestingFramework/Generated/Models/AzureMySqlSource.Serialization.cs
@@ -83,8 +83,8 @@ internal static AzureMySqlSource DeserializeAzureMySqlSource(JsonElement element
             Optional<DataFactoryElement<string>> sourceRetryWait = default;
             Optional<DataFactoryElement<int>> maxConcurrentConnections = default;
             Optional<DataFactoryElement<bool>> disableMetricsCollection = default;
-            IDictionary<string, BinaryData> additionalProperties = default;
-            Dictionary<string, BinaryData> additionalPropertiesDictionary = new Dictionary<string, BinaryData>();
+            IDictionary<string, DataFactoryElement<string>> additionalProperties = default;
+            Dictionary<string, DataFactoryElement<string>> additionalPropertiesDictionary = new Dictionary<string, DataFactoryElement<string>>();
             foreach (var property in element.EnumerateObject())
             {
                 if (property.NameEquals("query"u8))
@@ -155,7 +155,7 @@ internal static AzureMySqlSource DeserializeAzureMySqlSource(JsonElement element
                     disableMetricsCollection = JsonSerializer.Deserialize<DataFactoryElement<bool>>(property.Value.GetRawText());
                     continue;
                 }
-                additionalPropertiesDictionary.Add(property.Name, BinaryData.FromString(property.Value.GetRawText()));
+                additionalPropertiesDictionary.Add(property.Name, JsonSerializer.Deserialize<DataFactoryElement<string>>(property.Value.GetRawText()));
             }
             additionalProperties = additionalPropertiesDictionary;
             return new AzureMySqlSource(type, sourceRetryCount.Value, sourceRetryWait.Value, maxConcurrentConnections.Value, disableMetricsCollection.Value, additionalProperties, queryTimeout.Value, additionalColumns.Value, query.Value);
diff --git a/src/AzureDataFactory.TestingFramework/Generated/Models/AzureMySqlSource.cs b/src/AzureDataFactory.TestingFramework/Generated/Models/AzureMySqlSource.cs
index 859fe1cd..8c6c9af6 100644
--- a/src/AzureDataFactory.TestingFramework/Generated/Models/AzureMySqlSource.cs
+++ b/src/AzureDataFactory.TestingFramework/Generated/Models/AzureMySqlSource.cs
@@ -28,7 +28,7 @@ public AzureMySqlSource()
         /// <param name="queryTimeout"> Query timeout. Type: string (or Expression with resultType string), pattern: ((\d+)\.)?(\d\d):(60|([0-5][0-9])):(60|([0-5][0-9])). </param>
         /// <param name="additionalColumns"> Specifies the additional columns to be added to source data. Type: array of objects(AdditionalColumns) (or Expression with resultType array of objects). </param>
         /// <param name="query"> Database query. Type: string (or Expression with resultType string). </param>
-        internal AzureMySqlSource(string copySourceType, DataFactoryElement<int> sourceRetryCount, DataFactoryElement<string> sourceRetryWait, DataFactoryElement<int> maxConcurrentConnections, DataFactoryElement<bool> disableMetricsCollection, IDictionary<string, BinaryData> additionalProperties, DataFactoryElement<string> queryTimeout, BinaryData additionalColumns, DataFactoryElement<string> query) : base(copySourceType, sourceRetryCount, sourceRetryWait, maxConcurrentConnections, disableMetricsCollection, additionalProperties, queryTimeout, additionalColumns)
+        internal AzureMySqlSource(string copySourceType, DataFactoryElement<int> sourceRetryCount, DataFactoryElement<string> sourceRetryWait, DataFactoryElement<int> maxConcurrentConnections, DataFactoryElement<bool> disableMetricsCollection, IDictionary<string, DataFactoryElement<string>> additionalProperties, DataFactoryElement<string> queryTimeout, BinaryData additionalColumns, DataFactoryElement<string> query) : base(copySourceType, sourceRetryCount, sourceRetryWait, maxConcurrentConnections, disableMetricsCollection, additionalProperties, queryTimeout, additionalColumns)
         {
             Query = query;
             CopySourceType = copySourceType ?? "AzureMySqlSource";
diff --git a/src/AzureDataFactory.TestingFramework/Generated/Models/AzureMySqlTableDataset.Serialization.cs b/src/AzureDataFactory.TestingFramework/Generated/Models/AzureMySqlTableDataset.Serialization.cs
index 562ffdb8..b6d73804 100644
--- a/src/AzureDataFactory.TestingFramework/Generated/Models/AzureMySqlTableDataset.Serialization.cs
+++ b/src/AzureDataFactory.TestingFramework/Generated/Models/AzureMySqlTableDataset.Serialization.cs
@@ -110,8 +110,8 @@ internal static AzureMySqlTableDataset DeserializeAzureMySqlTableDataset(JsonEle
             Optional<DatasetFolder> folder = default;
             Optional<DataFactoryElement<string>> tableName = default;
             Optional<DataFactoryElement<string>> table = default;
-            IDictionary<string, BinaryData> additionalProperties = default;
-            Dictionary<string, BinaryData> additionalPropertiesDictionary = new Dictionary<string, BinaryData>();
+            IDictionary<string, DataFactoryElement<string>> additionalProperties = default;
+            Dictionary<string, DataFactoryElement<string>> additionalPropertiesDictionary = new Dictionary<string, DataFactoryElement<string>>();
             foreach (var property in element.EnumerateObject())
             {
                 if (property.NameEquals("type"u8))
@@ -221,7 +221,7 @@ internal static AzureMySqlTableDataset DeserializeAzureMySqlTableDataset(JsonEle
                     }
                     continue;
                 }
-                additionalPropertiesDictionary.Add(property.Name, BinaryData.FromString(property.Value.GetRawText()));
+                additionalPropertiesDictionary.Add(property.Name, JsonSerializer.Deserialize<DataFactoryElement<string>>(property.Value.GetRawText()));
             }
             additionalProperties = additionalPropertiesDictionary;
             return new AzureMySqlTableDataset(type, description.Value, structure.Value, schema.Value, linkedServiceName, Optional.ToDictionary(parameters), Optional.ToList(annotations), folder.Value, additionalProperties, tableName.Value, table.Value);
diff --git a/src/AzureDataFactory.TestingFramework/Generated/Models/AzureMySqlTableDataset.cs b/src/AzureDataFactory.TestingFramework/Generated/Models/AzureMySqlTableDataset.cs
index fd2e6e05..d05ca4bd 100644
--- a/src/AzureDataFactory.TestingFramework/Generated/Models/AzureMySqlTableDataset.cs
+++ b/src/AzureDataFactory.TestingFramework/Generated/Models/AzureMySqlTableDataset.cs
@@ -35,7 +35,7 @@ public AzureMySqlTableDataset(DataFactoryLinkedServiceReference linkedServiceNam
         /// <param name="additionalProperties"> Additional Properties. </param>
         /// <param name="tableName"> The Azure MySQL database table name. Type: string (or Expression with resultType string). </param>
         /// <param name="table"> The name of Azure MySQL database table. Type: string (or Expression with resultType string). </param>
-        internal AzureMySqlTableDataset(string datasetType, string description, DataFactoryElement<IList<DatasetDataElement>> structure, DataFactoryElement<IList<DatasetSchemaDataElement>> schema, DataFactoryLinkedServiceReference linkedServiceName, IDictionary<string, EntityParameterSpecification> parameters, IList<BinaryData> annotations, DatasetFolder folder, IDictionary<string, BinaryData> additionalProperties, DataFactoryElement<string> tableName, DataFactoryElement<string> table) : base(datasetType, description, structure, schema, linkedServiceName, parameters, annotations, folder, additionalProperties)
+        internal AzureMySqlTableDataset(string datasetType, string description, DataFactoryElement<IList<DatasetDataElement>> structure, DataFactoryElement<IList<DatasetSchemaDataElement>> schema, DataFactoryLinkedServiceReference linkedServiceName, IDictionary<string, EntityParameterSpecification> parameters, IList<BinaryData> annotations, DatasetFolder folder, IDictionary<string, DataFactoryElement<string>> additionalProperties, DataFactoryElement<string> tableName, DataFactoryElement<string> table) : base(datasetType, description, structure, schema, linkedServiceName, parameters, annotations, folder, additionalProperties)
         {
             TableName = tableName;
             Table = table;
diff --git a/src/AzureDataFactory.TestingFramework/Generated/Models/AzurePostgreSqlLinkedService.Serialization.cs b/src/AzureDataFactory.TestingFramework/Generated/Models/AzurePostgreSqlLinkedService.Serialization.cs
index f94b63da..627ede74 100644
--- a/src/AzureDataFactory.TestingFramework/Generated/Models/AzurePostgreSqlLinkedService.Serialization.cs
+++ b/src/AzureDataFactory.TestingFramework/Generated/Models/AzurePostgreSqlLinkedService.Serialization.cs
@@ -102,8 +102,8 @@ internal static AzurePostgreSqlLinkedService DeserializeAzurePostgreSqlLinkedSer
             Optional<DataFactoryElement<string>> connectionString = default;
             Optional<DataFactoryKeyVaultSecretReference> password = default;
             Optional<string> encryptedCredential = default;
-            IDictionary<string, BinaryData> additionalProperties = default;
-            Dictionary<string, BinaryData> additionalPropertiesDictionary = new Dictionary<string, BinaryData>();
+            IDictionary<string, DataFactoryElement<string>> additionalProperties = default;
+            Dictionary<string, DataFactoryElement<string>> additionalPropertiesDictionary = new Dictionary<string, DataFactoryElement<string>>();
             foreach (var property in element.EnumerateObject())
             {
                 if (property.NameEquals("type"u8))
@@ -195,7 +195,7 @@ internal static AzurePostgreSqlLinkedService DeserializeAzurePostgreSqlLinkedSer
                     }
                     continue;
                 }
-                additionalPropertiesDictionary.Add(property.Name, BinaryData.FromString(property.Value.GetRawText()));
+                additionalPropertiesDictionary.Add(property.Name, JsonSerializer.Deserialize<DataFactoryElement<string>>(property.Value.GetRawText()));
             }
             additionalProperties = additionalPropertiesDictionary;
             return new AzurePostgreSqlLinkedService(type, connectVia.Value, description.Value, Optional.ToDictionary(parameters), Optional.ToList(annotations), additionalProperties, connectionString.Value, password, encryptedCredential.Value);
diff --git a/src/AzureDataFactory.TestingFramework/Generated/Models/AzurePostgreSqlLinkedService.cs b/src/AzureDataFactory.TestingFramework/Generated/Models/AzurePostgreSqlLinkedService.cs
index b1d13b61..d4bd23ca 100644
--- a/src/AzureDataFactory.TestingFramework/Generated/Models/AzurePostgreSqlLinkedService.cs
+++ b/src/AzureDataFactory.TestingFramework/Generated/Models/AzurePostgreSqlLinkedService.cs
@@ -28,7 +28,7 @@ public AzurePostgreSqlLinkedService()
         /// <param name="connectionString"> An ODBC connection string. Type: string, SecureString or AzureKeyVaultSecretReference. </param>
         /// <param name="password"> The Azure key vault secret reference of password in connection string. </param>
         /// <param name="encryptedCredential"> The encrypted credential used for authentication. Credentials are encrypted using the integration runtime credential manager. Type: string. </param>
-        internal AzurePostgreSqlLinkedService(string linkedServiceType, IntegrationRuntimeReference connectVia, string description, IDictionary<string, EntityParameterSpecification> parameters, IList<BinaryData> annotations, IDictionary<string, BinaryData> additionalProperties, DataFactoryElement<string> connectionString, DataFactoryKeyVaultSecretReference password, string encryptedCredential) : base(linkedServiceType, connectVia, description, parameters, annotations, additionalProperties)
+        internal AzurePostgreSqlLinkedService(string linkedServiceType, IntegrationRuntimeReference connectVia, string description, IDictionary<string, EntityParameterSpecification> parameters, IList<BinaryData> annotations, IDictionary<string, DataFactoryElement<string>> additionalProperties, DataFactoryElement<string> connectionString, DataFactoryKeyVaultSecretReference password, string encryptedCredential) : base(linkedServiceType, connectVia, description, parameters, annotations, additionalProperties)
         {
             ConnectionString = connectionString;
             Password = password;
diff --git a/src/AzureDataFactory.TestingFramework/Generated/Models/AzurePostgreSqlSink.Serialization.cs b/src/AzureDataFactory.TestingFramework/Generated/Models/AzurePostgreSqlSink.Serialization.cs
index 34763588..4528175e 100644
--- a/src/AzureDataFactory.TestingFramework/Generated/Models/AzurePostgreSqlSink.Serialization.cs
+++ b/src/AzureDataFactory.TestingFramework/Generated/Models/AzurePostgreSqlSink.Serialization.cs
@@ -79,8 +79,8 @@ internal static AzurePostgreSqlSink DeserializeAzurePostgreSqlSink(JsonElement e
             Optional<DataFactoryElement<string>> sinkRetryWait = default;
             Optional<DataFactoryElement<int>> maxConcurrentConnections = default;
             Optional<DataFactoryElement<bool>> disableMetricsCollection = default;
-            IDictionary<string, BinaryData> additionalProperties = default;
-            Dictionary<string, BinaryData> additionalPropertiesDictionary = new Dictionary<string, BinaryData>();
+            IDictionary<string, DataFactoryElement<string>> additionalProperties = default;
+            Dictionary<string, DataFactoryElement<string>> additionalPropertiesDictionary = new Dictionary<string, DataFactoryElement<string>>();
             foreach (var property in element.EnumerateObject())
             {
                 if (property.NameEquals("preCopyScript"u8))
@@ -151,7 +151,7 @@ internal static AzurePostgreSqlSink DeserializeAzurePostgreSqlSink(JsonElement e
                     disableMetricsCollection = JsonSerializer.Deserialize<DataFactoryElement<bool>>(property.Value.GetRawText());
                     continue;
                 }
-                additionalPropertiesDictionary.Add(property.Name, BinaryData.FromString(property.Value.GetRawText()));
+                additionalPropertiesDictionary.Add(property.Name, JsonSerializer.Deserialize<DataFactoryElement<string>>(property.Value.GetRawText()));
             }
             additionalProperties = additionalPropertiesDictionary;
             return new AzurePostgreSqlSink(type, writeBatchSize.Value, writeBatchTimeout.Value, sinkRetryCount.Value, sinkRetryWait.Value, maxConcurrentConnections.Value, disableMetricsCollection.Value, additionalProperties, preCopyScript.Value);
diff --git a/src/AzureDataFactory.TestingFramework/Generated/Models/AzurePostgreSqlSink.cs b/src/AzureDataFactory.TestingFramework/Generated/Models/AzurePostgreSqlSink.cs
index 07a3433f..f151157f 100644
--- a/src/AzureDataFactory.TestingFramework/Generated/Models/AzurePostgreSqlSink.cs
+++ b/src/AzureDataFactory.TestingFramework/Generated/Models/AzurePostgreSqlSink.cs
@@ -28,7 +28,7 @@ public AzurePostgreSqlSink()
         /// <param name="disableMetricsCollection"> If true, disable data store metrics collection. Default is false. Type: boolean (or Expression with resultType boolean). </param>
         /// <param name="additionalProperties"> Additional Properties. </param>
         /// <param name="preCopyScript"> A query to execute before starting the copy. Type: string (or Expression with resultType string). </param>
-        internal AzurePostgreSqlSink(string copySinkType, DataFactoryElement<int> writeBatchSize, DataFactoryElement<string> writeBatchTimeout, DataFactoryElement<int> sinkRetryCount, DataFactoryElement<string> sinkRetryWait, DataFactoryElement<int> maxConcurrentConnections, DataFactoryElement<bool> disableMetricsCollection, IDictionary<string, BinaryData> additionalProperties, DataFactoryElement<string> preCopyScript) : base(copySinkType, writeBatchSize, writeBatchTimeout, sinkRetryCount, sinkRetryWait, maxConcurrentConnections, disableMetricsCollection, additionalProperties)
+        internal AzurePostgreSqlSink(string copySinkType, DataFactoryElement<int> writeBatchSize, DataFactoryElement<string> writeBatchTimeout, DataFactoryElement<int> sinkRetryCount, DataFactoryElement<string> sinkRetryWait, DataFactoryElement<int> maxConcurrentConnections, DataFactoryElement<bool> disableMetricsCollection, IDictionary<string, DataFactoryElement<string>> additionalProperties, DataFactoryElement<string> preCopyScript) : base(copySinkType, writeBatchSize, writeBatchTimeout, sinkRetryCount, sinkRetryWait, maxConcurrentConnections, disableMetricsCollection, additionalProperties)
         {
             PreCopyScript = preCopyScript;
             CopySinkType = copySinkType ?? "AzurePostgreSqlSink";
diff --git a/src/AzureDataFactory.TestingFramework/Generated/Models/AzurePostgreSqlSource.Serialization.cs b/src/AzureDataFactory.TestingFramework/Generated/Models/AzurePostgreSqlSource.Serialization.cs
index 2df5cb70..3cd9beef 100644
--- a/src/AzureDataFactory.TestingFramework/Generated/Models/AzurePostgreSqlSource.Serialization.cs
+++ b/src/AzureDataFactory.TestingFramework/Generated/Models/AzurePostgreSqlSource.Serialization.cs
@@ -83,8 +83,8 @@ internal static AzurePostgreSqlSource DeserializeAzurePostgreSqlSource(JsonEleme
             Optional<DataFactoryElement<string>> sourceRetryWait = default;
             Optional<DataFactoryElement<int>> maxConcurrentConnections = default;
             Optional<DataFactoryElement<bool>> disableMetricsCollection = default;
-            IDictionary<string, BinaryData> additionalProperties = default;
-            Dictionary<string, BinaryData> additionalPropertiesDictionary = new Dictionary<string, BinaryData>();
+            IDictionary<string, DataFactoryElement<string>> additionalProperties = default;
+            Dictionary<string, DataFactoryElement<string>> additionalPropertiesDictionary = new Dictionary<string, DataFactoryElement<string>>();
             foreach (var property in element.EnumerateObject())
             {
                 if (property.NameEquals("query"u8))
@@ -155,7 +155,7 @@ internal static AzurePostgreSqlSource DeserializeAzurePostgreSqlSource(JsonEleme
                     disableMetricsCollection = JsonSerializer.Deserialize<DataFactoryElement<bool>>(property.Value.GetRawText());
                     continue;
                 }
-                additionalPropertiesDictionary.Add(property.Name, BinaryData.FromString(property.Value.GetRawText()));
+                additionalPropertiesDictionary.Add(property.Name, JsonSerializer.Deserialize<DataFactoryElement<string>>(property.Value.GetRawText()));
             }
             additionalProperties = additionalPropertiesDictionary;
             return new AzurePostgreSqlSource(type, sourceRetryCount.Value, sourceRetryWait.Value, maxConcurrentConnections.Value, disableMetricsCollection.Value, additionalProperties, queryTimeout.Value, additionalColumns.Value, query.Value);
diff --git a/src/AzureDataFactory.TestingFramework/Generated/Models/AzurePostgreSqlSource.cs b/src/AzureDataFactory.TestingFramework/Generated/Models/AzurePostgreSqlSource.cs
index 981fa7e3..f4e028dc 100644
--- a/src/AzureDataFactory.TestingFramework/Generated/Models/AzurePostgreSqlSource.cs
+++ b/src/AzureDataFactory.TestingFramework/Generated/Models/AzurePostgreSqlSource.cs
@@ -28,7 +28,7 @@ public AzurePostgreSqlSource()
         /// <param name="queryTimeout"> Query timeout. Type: string (or Expression with resultType string), pattern: ((\d+)\.)?(\d\d):(60|([0-5][0-9])):(60|([0-5][0-9])). </param>
         /// <param name="additionalColumns"> Specifies the additional columns to be added to source data. Type: array of objects(AdditionalColumns) (or Expression with resultType array of objects). </param>
         /// <param name="query"> A query to retrieve data from source. Type: string (or Expression with resultType string). </param>
-        internal AzurePostgreSqlSource(string copySourceType, DataFactoryElement<int> sourceRetryCount, DataFactoryElement<string> sourceRetryWait, DataFactoryElement<int> maxConcurrentConnections, DataFactoryElement<bool> disableMetricsCollection, IDictionary<string, BinaryData> additionalProperties, DataFactoryElement<string> queryTimeout, BinaryData additionalColumns, DataFactoryElement<string> query) : base(copySourceType, sourceRetryCount, sourceRetryWait, maxConcurrentConnections, disableMetricsCollection, additionalProperties, queryTimeout, additionalColumns)
+        internal AzurePostgreSqlSource(string copySourceType, DataFactoryElement<int> sourceRetryCount, DataFactoryElement<string> sourceRetryWait, DataFactoryElement<int> maxConcurrentConnections, DataFactoryElement<bool> disableMetricsCollection, IDictionary<string, DataFactoryElement<string>> additionalProperties, DataFactoryElement<string> queryTimeout, BinaryData additionalColumns, DataFactoryElement<string> query) : base(copySourceType, sourceRetryCount, sourceRetryWait, maxConcurrentConnections, disableMetricsCollection, additionalProperties, queryTimeout, additionalColumns)
         {
             Query = query;
             CopySourceType = copySourceType ?? "AzurePostgreSqlSource";
diff --git a/src/AzureDataFactory.TestingFramework/Generated/Models/AzurePostgreSqlTableDataset.Serialization.cs b/src/AzureDataFactory.TestingFramework/Generated/Models/AzurePostgreSqlTableDataset.Serialization.cs
index a7fec3e3..d0d8c27f 100644
--- a/src/AzureDataFactory.TestingFramework/Generated/Models/AzurePostgreSqlTableDataset.Serialization.cs
+++ b/src/AzureDataFactory.TestingFramework/Generated/Models/AzurePostgreSqlTableDataset.Serialization.cs
@@ -116,8 +116,8 @@ internal static AzurePostgreSqlTableDataset DeserializeAzurePostgreSqlTableDatas
             Optional<DataFactoryElement<string>> tableName = default;
             Optional<DataFactoryElement<string>> table = default;
             Optional<DataFactoryElement<string>> schema0 = default;
-            IDictionary<string, BinaryData> additionalProperties = default;
-            Dictionary<string, BinaryData> additionalPropertiesDictionary = new Dictionary<string, BinaryData>();
+            IDictionary<string, DataFactoryElement<string>> additionalProperties = default;
+            Dictionary<string, DataFactoryElement<string>> additionalPropertiesDictionary = new Dictionary<string, DataFactoryElement<string>>();
             foreach (var property in element.EnumerateObject())
             {
                 if (property.NameEquals("type"u8))
@@ -236,7 +236,7 @@ internal static AzurePostgreSqlTableDataset DeserializeAzurePostgreSqlTableDatas
                     }
                     continue;
                 }
-                additionalPropertiesDictionary.Add(property.Name, BinaryData.FromString(property.Value.GetRawText()));
+                additionalPropertiesDictionary.Add(property.Name, JsonSerializer.Deserialize<DataFactoryElement<string>>(property.Value.GetRawText()));
             }
             additionalProperties = additionalPropertiesDictionary;
             return new AzurePostgreSqlTableDataset(type, description.Value, structure.Value, schema.Value, linkedServiceName, Optional.ToDictionary(parameters), Optional.ToList(annotations), folder.Value, additionalProperties, tableName.Value, table.Value, schema0.Value);
diff --git a/src/AzureDataFactory.TestingFramework/Generated/Models/AzurePostgreSqlTableDataset.cs b/src/AzureDataFactory.TestingFramework/Generated/Models/AzurePostgreSqlTableDataset.cs
index 52a2cece..0a485dde 100644
--- a/src/AzureDataFactory.TestingFramework/Generated/Models/AzurePostgreSqlTableDataset.cs
+++ b/src/AzureDataFactory.TestingFramework/Generated/Models/AzurePostgreSqlTableDataset.cs
@@ -36,7 +36,7 @@ public AzurePostgreSqlTableDataset(DataFactoryLinkedServiceReference linkedServi
         /// <param name="tableName"> The table name of the Azure PostgreSQL database which includes both schema and table. Type: string (or Expression with resultType string). </param>
         /// <param name="table"> The table name of the Azure PostgreSQL database. Type: string (or Expression with resultType string). </param>
         /// <param name="schemaTypePropertiesSchema"> The schema name of the Azure PostgreSQL database. Type: string (or Expression with resultType string). </param>
-        internal AzurePostgreSqlTableDataset(string datasetType, string description, DataFactoryElement<IList<DatasetDataElement>> structure, DataFactoryElement<IList<DatasetSchemaDataElement>> schema, DataFactoryLinkedServiceReference linkedServiceName, IDictionary<string, EntityParameterSpecification> parameters, IList<BinaryData> annotations, DatasetFolder folder, IDictionary<string, BinaryData> additionalProperties, DataFactoryElement<string> tableName, DataFactoryElement<string> table, DataFactoryElement<string> schemaTypePropertiesSchema) : base(datasetType, description, structure, schema, linkedServiceName, parameters, annotations, folder, additionalProperties)
+        internal AzurePostgreSqlTableDataset(string datasetType, string description, DataFactoryElement<IList<DatasetDataElement>> structure, DataFactoryElement<IList<DatasetSchemaDataElement>> schema, DataFactoryLinkedServiceReference linkedServiceName, IDictionary<string, EntityParameterSpecification> parameters, IList<BinaryData> annotations, DatasetFolder folder, IDictionary<string, DataFactoryElement<string>> additionalProperties, DataFactoryElement<string> tableName, DataFactoryElement<string> table, DataFactoryElement<string> schemaTypePropertiesSchema) : base(datasetType, description, structure, schema, linkedServiceName, parameters, annotations, folder, additionalProperties)
         {
             TableName = tableName;
             Table = table;
diff --git a/src/AzureDataFactory.TestingFramework/Generated/Models/AzureQueueSink.Serialization.cs b/src/AzureDataFactory.TestingFramework/Generated/Models/AzureQueueSink.Serialization.cs
index 1f013eb0..d1b8328e 100644
--- a/src/AzureDataFactory.TestingFramework/Generated/Models/AzureQueueSink.Serialization.cs
+++ b/src/AzureDataFactory.TestingFramework/Generated/Models/AzureQueueSink.Serialization.cs
@@ -73,8 +73,8 @@ internal static AzureQueueSink DeserializeAzureQueueSink(JsonElement element)
             Optional<DataFactoryElement<string>> sinkRetryWait = default;
             Optional<DataFactoryElement<int>> maxConcurrentConnections = default;
             Optional<DataFactoryElement<bool>> disableMetricsCollection = default;
-            IDictionary<string, BinaryData> additionalProperties = default;
-            Dictionary<string, BinaryData> additionalPropertiesDictionary = new Dictionary<string, BinaryData>();
+            IDictionary<string, DataFactoryElement<string>> additionalProperties = default;
+            Dictionary<string, DataFactoryElement<string>> additionalPropertiesDictionary = new Dictionary<string, DataFactoryElement<string>>();
             foreach (var property in element.EnumerateObject())
             {
                 if (property.NameEquals("type"u8))
@@ -136,7 +136,7 @@ internal static AzureQueueSink DeserializeAzureQueueSink(JsonElement element)
                     disableMetricsCollection = JsonSerializer.Deserialize<DataFactoryElement<bool>>(property.Value.GetRawText());
                     continue;
                 }
-                additionalPropertiesDictionary.Add(property.Name, BinaryData.FromString(property.Value.GetRawText()));
+                additionalPropertiesDictionary.Add(property.Name, JsonSerializer.Deserialize<DataFactoryElement<string>>(property.Value.GetRawText()));
             }
             additionalProperties = additionalPropertiesDictionary;
             return new AzureQueueSink(type, writeBatchSize.Value, writeBatchTimeout.Value, sinkRetryCount.Value, sinkRetryWait.Value, maxConcurrentConnections.Value, disableMetricsCollection.Value, additionalProperties);
diff --git a/src/AzureDataFactory.TestingFramework/Generated/Models/AzureQueueSink.cs b/src/AzureDataFactory.TestingFramework/Generated/Models/AzureQueueSink.cs
index b05b0965..5e560c7b 100644
--- a/src/AzureDataFactory.TestingFramework/Generated/Models/AzureQueueSink.cs
+++ b/src/AzureDataFactory.TestingFramework/Generated/Models/AzureQueueSink.cs
@@ -27,7 +27,7 @@ public AzureQueueSink()
         /// <param name="maxConcurrentConnections"> The maximum concurrent connection count for the sink data store. Type: integer (or Expression with resultType integer). </param>
         /// <param name="disableMetricsCollection"> If true, disable data store metrics collection. Default is false. Type: boolean (or Expression with resultType boolean). </param>
         /// <param name="additionalProperties"> Additional Properties. </param>
-        internal AzureQueueSink(string copySinkType, DataFactoryElement<int> writeBatchSize, DataFactoryElement<string> writeBatchTimeout, DataFactoryElement<int> sinkRetryCount, DataFactoryElement<string> sinkRetryWait, DataFactoryElement<int> maxConcurrentConnections, DataFactoryElement<bool> disableMetricsCollection, IDictionary<string, BinaryData> additionalProperties) : base(copySinkType, writeBatchSize, writeBatchTimeout, sinkRetryCount, sinkRetryWait, maxConcurrentConnections, disableMetricsCollection, additionalProperties)
+        internal AzureQueueSink(string copySinkType, DataFactoryElement<int> writeBatchSize, DataFactoryElement<string> writeBatchTimeout, DataFactoryElement<int> sinkRetryCount, DataFactoryElement<string> sinkRetryWait, DataFactoryElement<int> maxConcurrentConnections, DataFactoryElement<bool> disableMetricsCollection, IDictionary<string, DataFactoryElement<string>> additionalProperties) : base(copySinkType, writeBatchSize, writeBatchTimeout, sinkRetryCount, sinkRetryWait, maxConcurrentConnections, disableMetricsCollection, additionalProperties)
         {
             CopySinkType = copySinkType ?? "AzureQueueSink";
         }
diff --git a/src/AzureDataFactory.TestingFramework/Generated/Models/AzureSearchIndexDataset.Serialization.cs b/src/AzureDataFactory.TestingFramework/Generated/Models/AzureSearchIndexDataset.Serialization.cs
index d6f8aabf..32ea8bd0 100644
--- a/src/AzureDataFactory.TestingFramework/Generated/Models/AzureSearchIndexDataset.Serialization.cs
+++ b/src/AzureDataFactory.TestingFramework/Generated/Models/AzureSearchIndexDataset.Serialization.cs
@@ -101,8 +101,8 @@ internal static AzureSearchIndexDataset DeserializeAzureSearchIndexDataset(JsonE
             Optional<IList<BinaryData>> annotations = default;
             Optional<DatasetFolder> folder = default;
             DataFactoryElement<string> indexName = default;
-            IDictionary<string, BinaryData> additionalProperties = default;
-            Dictionary<string, BinaryData> additionalPropertiesDictionary = new Dictionary<string, BinaryData>();
+            IDictionary<string, DataFactoryElement<string>> additionalProperties = default;
+            Dictionary<string, DataFactoryElement<string>> additionalPropertiesDictionary = new Dictionary<string, DataFactoryElement<string>>();
             foreach (var property in element.EnumerateObject())
             {
                 if (property.NameEquals("type"u8))
@@ -199,7 +199,7 @@ internal static AzureSearchIndexDataset DeserializeAzureSearchIndexDataset(JsonE
                     }
                     continue;
                 }
-                additionalPropertiesDictionary.Add(property.Name, BinaryData.FromString(property.Value.GetRawText()));
+                additionalPropertiesDictionary.Add(property.Name, JsonSerializer.Deserialize<DataFactoryElement<string>>(property.Value.GetRawText()));
             }
             additionalProperties = additionalPropertiesDictionary;
             return new AzureSearchIndexDataset(type, description.Value, structure.Value, schema.Value, linkedServiceName, Optional.ToDictionary(parameters), Optional.ToList(annotations), folder.Value, additionalProperties, indexName);
diff --git a/src/AzureDataFactory.TestingFramework/Generated/Models/AzureSearchIndexDataset.cs b/src/AzureDataFactory.TestingFramework/Generated/Models/AzureSearchIndexDataset.cs
index f33cc17d..2c1969d0 100644
--- a/src/AzureDataFactory.TestingFramework/Generated/Models/AzureSearchIndexDataset.cs
+++ b/src/AzureDataFactory.TestingFramework/Generated/Models/AzureSearchIndexDataset.cs
@@ -37,7 +37,7 @@ public AzureSearchIndexDataset(DataFactoryLinkedServiceReference linkedServiceNa
         /// <param name="folder"> The folder that this Dataset is in. If not specified, Dataset will appear at the root level. </param>
         /// <param name="additionalProperties"> Additional Properties. </param>
         /// <param name="indexName"> The name of the Azure Search Index. Type: string (or Expression with resultType string). </param>
-        internal AzureSearchIndexDataset(string datasetType, string description, DataFactoryElement<IList<DatasetDataElement>> structure, DataFactoryElement<IList<DatasetSchemaDataElement>> schema, DataFactoryLinkedServiceReference linkedServiceName, IDictionary<string, EntityParameterSpecification> parameters, IList<BinaryData> annotations, DatasetFolder folder, IDictionary<string, BinaryData> additionalProperties, DataFactoryElement<string> indexName) : base(datasetType, description, structure, schema, linkedServiceName, parameters, annotations, folder, additionalProperties)
+        internal AzureSearchIndexDataset(string datasetType, string description, DataFactoryElement<IList<DatasetDataElement>> structure, DataFactoryElement<IList<DatasetSchemaDataElement>> schema, DataFactoryLinkedServiceReference linkedServiceName, IDictionary<string, EntityParameterSpecification> parameters, IList<BinaryData> annotations, DatasetFolder folder, IDictionary<string, DataFactoryElement<string>> additionalProperties, DataFactoryElement<string> indexName) : base(datasetType, description, structure, schema, linkedServiceName, parameters, annotations, folder, additionalProperties)
         {
             IndexName = indexName;
             DatasetType = datasetType ?? "AzureSearchIndex";
diff --git a/src/AzureDataFactory.TestingFramework/Generated/Models/AzureSearchIndexSink.Serialization.cs b/src/AzureDataFactory.TestingFramework/Generated/Models/AzureSearchIndexSink.Serialization.cs
index e32267e4..ba510559 100644
--- a/src/AzureDataFactory.TestingFramework/Generated/Models/AzureSearchIndexSink.Serialization.cs
+++ b/src/AzureDataFactory.TestingFramework/Generated/Models/AzureSearchIndexSink.Serialization.cs
@@ -79,8 +79,8 @@ internal static AzureSearchIndexSink DeserializeAzureSearchIndexSink(JsonElement
             Optional<DataFactoryElement<string>> sinkRetryWait = default;
             Optional<DataFactoryElement<int>> maxConcurrentConnections = default;
             Optional<DataFactoryElement<bool>> disableMetricsCollection = default;
-            IDictionary<string, BinaryData> additionalProperties = default;
-            Dictionary<string, BinaryData> additionalPropertiesDictionary = new Dictionary<string, BinaryData>();
+            IDictionary<string, DataFactoryElement<string>> additionalProperties = default;
+            Dictionary<string, DataFactoryElement<string>> additionalPropertiesDictionary = new Dictionary<string, DataFactoryElement<string>>();
             foreach (var property in element.EnumerateObject())
             {
                 if (property.NameEquals("writeBehavior"u8))
@@ -151,7 +151,7 @@ internal static AzureSearchIndexSink DeserializeAzureSearchIndexSink(JsonElement
                     disableMetricsCollection = JsonSerializer.Deserialize<DataFactoryElement<bool>>(property.Value.GetRawText());
                     continue;
                 }
-                additionalPropertiesDictionary.Add(property.Name, BinaryData.FromString(property.Value.GetRawText()));
+                additionalPropertiesDictionary.Add(property.Name, JsonSerializer.Deserialize<DataFactoryElement<string>>(property.Value.GetRawText()));
             }
             additionalProperties = additionalPropertiesDictionary;
             return new AzureSearchIndexSink(type, writeBatchSize.Value, writeBatchTimeout.Value, sinkRetryCount.Value, sinkRetryWait.Value, maxConcurrentConnections.Value, disableMetricsCollection.Value, additionalProperties, Optional.ToNullable(writeBehavior));
diff --git a/src/AzureDataFactory.TestingFramework/Generated/Models/AzureSearchIndexSink.cs b/src/AzureDataFactory.TestingFramework/Generated/Models/AzureSearchIndexSink.cs
index 85153492..e04d1302 100644
--- a/src/AzureDataFactory.TestingFramework/Generated/Models/AzureSearchIndexSink.cs
+++ b/src/AzureDataFactory.TestingFramework/Generated/Models/AzureSearchIndexSink.cs
@@ -28,7 +28,7 @@ public AzureSearchIndexSink()
         /// <param name="disableMetricsCollection"> If true, disable data store metrics collection. Default is false. Type: boolean (or Expression with resultType boolean). </param>
         /// <param name="additionalProperties"> Additional Properties. </param>
         /// <param name="writeBehavior"> Specify the write behavior when upserting documents into Azure Search Index. </param>
-        internal AzureSearchIndexSink(string copySinkType, DataFactoryElement<int> writeBatchSize, DataFactoryElement<string> writeBatchTimeout, DataFactoryElement<int> sinkRetryCount, DataFactoryElement<string> sinkRetryWait, DataFactoryElement<int> maxConcurrentConnections, DataFactoryElement<bool> disableMetricsCollection, IDictionary<string, BinaryData> additionalProperties, AzureSearchIndexWriteBehaviorType? writeBehavior) : base(copySinkType, writeBatchSize, writeBatchTimeout, sinkRetryCount, sinkRetryWait, maxConcurrentConnections, disableMetricsCollection, additionalProperties)
+        internal AzureSearchIndexSink(string copySinkType, DataFactoryElement<int> writeBatchSize, DataFactoryElement<string> writeBatchTimeout, DataFactoryElement<int> sinkRetryCount, DataFactoryElement<string> sinkRetryWait, DataFactoryElement<int> maxConcurrentConnections, DataFactoryElement<bool> disableMetricsCollection, IDictionary<string, DataFactoryElement<string>> additionalProperties, AzureSearchIndexWriteBehaviorType? writeBehavior) : base(copySinkType, writeBatchSize, writeBatchTimeout, sinkRetryCount, sinkRetryWait, maxConcurrentConnections, disableMetricsCollection, additionalProperties)
         {
             WriteBehavior = writeBehavior;
             CopySinkType = copySinkType ?? "AzureSearchIndexSink";
diff --git a/src/AzureDataFactory.TestingFramework/Generated/Models/AzureSearchLinkedService.Serialization.cs b/src/AzureDataFactory.TestingFramework/Generated/Models/AzureSearchLinkedService.Serialization.cs
index be407ac9..7c7f411e 100644
--- a/src/AzureDataFactory.TestingFramework/Generated/Models/AzureSearchLinkedService.Serialization.cs
+++ b/src/AzureDataFactory.TestingFramework/Generated/Models/AzureSearchLinkedService.Serialization.cs
@@ -99,8 +99,8 @@ internal static AzureSearchLinkedService DeserializeAzureSearchLinkedService(Jso
             DataFactoryElement<string> url = default;
             Optional<DataFactorySecretBaseDefinition> key = default;
             Optional<string> encryptedCredential = default;
-            IDictionary<string, BinaryData> additionalProperties = default;
-            Dictionary<string, BinaryData> additionalPropertiesDictionary = new Dictionary<string, BinaryData>();
+            IDictionary<string, DataFactoryElement<string>> additionalProperties = default;
+            Dictionary<string, DataFactoryElement<string>> additionalPropertiesDictionary = new Dictionary<string, DataFactoryElement<string>>();
             foreach (var property in element.EnumerateObject())
             {
                 if (property.NameEquals("type"u8))
@@ -188,7 +188,7 @@ internal static AzureSearchLinkedService DeserializeAzureSearchLinkedService(Jso
                     }
                     continue;
                 }
-                additionalPropertiesDictionary.Add(property.Name, BinaryData.FromString(property.Value.GetRawText()));
+                additionalPropertiesDictionary.Add(property.Name, JsonSerializer.Deserialize<DataFactoryElement<string>>(property.Value.GetRawText()));
             }
             additionalProperties = additionalPropertiesDictionary;
             return new AzureSearchLinkedService(type, connectVia.Value, description.Value, Optional.ToDictionary(parameters), Optional.ToList(annotations), additionalProperties, url, key, encryptedCredential.Value);
diff --git a/src/AzureDataFactory.TestingFramework/Generated/Models/AzureSearchLinkedService.cs b/src/AzureDataFactory.TestingFramework/Generated/Models/AzureSearchLinkedService.cs
index 87729fe5..fee0ede9 100644
--- a/src/AzureDataFactory.TestingFramework/Generated/Models/AzureSearchLinkedService.cs
+++ b/src/AzureDataFactory.TestingFramework/Generated/Models/AzureSearchLinkedService.cs
@@ -34,7 +34,7 @@ public AzureSearchLinkedService(DataFactoryElement<string> uri)
         /// <param name="uri"> URL for Azure Search service. Type: string (or Expression with resultType string). </param>
         /// <param name="key"> Admin Key for Azure Search service. </param>
         /// <param name="encryptedCredential"> The encrypted credential used for authentication. Credentials are encrypted using the integration runtime credential manager. Type: string. </param>
-        internal AzureSearchLinkedService(string linkedServiceType, IntegrationRuntimeReference connectVia, string description, IDictionary<string, EntityParameterSpecification> parameters, IList<BinaryData> annotations, IDictionary<string, BinaryData> additionalProperties, DataFactoryElement<string> uri, DataFactorySecretBaseDefinition key, string encryptedCredential) : base(linkedServiceType, connectVia, description, parameters, annotations, additionalProperties)
+        internal AzureSearchLinkedService(string linkedServiceType, IntegrationRuntimeReference connectVia, string description, IDictionary<string, EntityParameterSpecification> parameters, IList<BinaryData> annotations, IDictionary<string, DataFactoryElement<string>> additionalProperties, DataFactoryElement<string> uri, DataFactorySecretBaseDefinition key, string encryptedCredential) : base(linkedServiceType, connectVia, description, parameters, annotations, additionalProperties)
         {
             Uri = uri;
             Key = key;
diff --git a/src/AzureDataFactory.TestingFramework/Generated/Models/AzureSqlDWLinkedService.Serialization.cs b/src/AzureDataFactory.TestingFramework/Generated/Models/AzureSqlDWLinkedService.Serialization.cs
index 25557352..ef12e1f4 100644
--- a/src/AzureDataFactory.TestingFramework/Generated/Models/AzureSqlDWLinkedService.Serialization.cs
+++ b/src/AzureDataFactory.TestingFramework/Generated/Models/AzureSqlDWLinkedService.Serialization.cs
@@ -129,8 +129,8 @@ internal static AzureSqlDWLinkedService DeserializeAzureSqlDWLinkedService(JsonE
             Optional<DataFactoryElement<string>> azureCloudType = default;
             Optional<string> encryptedCredential = default;
             Optional<DataFactoryCredentialReference> credential = default;
-            IDictionary<string, BinaryData> additionalProperties = default;
-            Dictionary<string, BinaryData> additionalPropertiesDictionary = new Dictionary<string, BinaryData>();
+            IDictionary<string, DataFactoryElement<string>> additionalProperties = default;
+            Dictionary<string, DataFactoryElement<string>> additionalPropertiesDictionary = new Dictionary<string, DataFactoryElement<string>>();
             foreach (var property in element.EnumerateObject())
             {
                 if (property.NameEquals("type"u8))
@@ -263,7 +263,7 @@ internal static AzureSqlDWLinkedService DeserializeAzureSqlDWLinkedService(JsonE
                     }
                     continue;
                 }
-                additionalPropertiesDictionary.Add(property.Name, BinaryData.FromString(property.Value.GetRawText()));
+                additionalPropertiesDictionary.Add(property.Name, JsonSerializer.Deserialize<DataFactoryElement<string>>(property.Value.GetRawText()));
             }
             additionalProperties = additionalPropertiesDictionary;
             return new AzureSqlDWLinkedService(type, connectVia.Value, description.Value, Optional.ToDictionary(parameters), Optional.ToList(annotations), additionalProperties, connectionString, password, servicePrincipalId.Value, servicePrincipalKey, tenant.Value, azureCloudType.Value, encryptedCredential.Value, credential.Value);
diff --git a/src/AzureDataFactory.TestingFramework/Generated/Models/AzureSqlDWLinkedService.cs b/src/AzureDataFactory.TestingFramework/Generated/Models/AzureSqlDWLinkedService.cs
index 5b223535..2e190f92 100644
--- a/src/AzureDataFactory.TestingFramework/Generated/Models/AzureSqlDWLinkedService.cs
+++ b/src/AzureDataFactory.TestingFramework/Generated/Models/AzureSqlDWLinkedService.cs
@@ -39,7 +39,7 @@ public AzureSqlDWLinkedService(DataFactoryElement<string> connectionString)
         /// <param name="azureCloudType"> Indicates the azure cloud type of the service principle auth. Allowed values are AzurePublic, AzureChina, AzureUsGovernment, AzureGermany. Default value is the data factory regions’ cloud type. Type: string (or Expression with resultType string). </param>
         /// <param name="encryptedCredential"> The encrypted credential used for authentication. Credentials are encrypted using the integration runtime credential manager. Type: string. </param>
         /// <param name="credential"> The credential reference containing authentication information. </param>
-        internal AzureSqlDWLinkedService(string linkedServiceType, IntegrationRuntimeReference connectVia, string description, IDictionary<string, EntityParameterSpecification> parameters, IList<BinaryData> annotations, IDictionary<string, BinaryData> additionalProperties, DataFactoryElement<string> connectionString, DataFactoryKeyVaultSecretReference password, DataFactoryElement<string> servicePrincipalId, DataFactorySecretBaseDefinition servicePrincipalKey, DataFactoryElement<string> tenant, DataFactoryElement<string> azureCloudType, string encryptedCredential, DataFactoryCredentialReference credential) : base(linkedServiceType, connectVia, description, parameters, annotations, additionalProperties)
+        internal AzureSqlDWLinkedService(string linkedServiceType, IntegrationRuntimeReference connectVia, string description, IDictionary<string, EntityParameterSpecification> parameters, IList<BinaryData> annotations, IDictionary<string, DataFactoryElement<string>> additionalProperties, DataFactoryElement<string> connectionString, DataFactoryKeyVaultSecretReference password, DataFactoryElement<string> servicePrincipalId, DataFactorySecretBaseDefinition servicePrincipalKey, DataFactoryElement<string> tenant, DataFactoryElement<string> azureCloudType, string encryptedCredential, DataFactoryCredentialReference credential) : base(linkedServiceType, connectVia, description, parameters, annotations, additionalProperties)
         {
             ConnectionString = connectionString;
             Password = password;
diff --git a/src/AzureDataFactory.TestingFramework/Generated/Models/AzureSqlDWTableDataset.Serialization.cs b/src/AzureDataFactory.TestingFramework/Generated/Models/AzureSqlDWTableDataset.Serialization.cs
index d743183b..762d12f5 100644
--- a/src/AzureDataFactory.TestingFramework/Generated/Models/AzureSqlDWTableDataset.Serialization.cs
+++ b/src/AzureDataFactory.TestingFramework/Generated/Models/AzureSqlDWTableDataset.Serialization.cs
@@ -120,8 +120,8 @@ internal static AzureSqlDWTableDataset DeserializeAzureSqlDWTableDataset(JsonEle
             Optional<BinaryData> tableName = default;
             Optional<DataFactoryElement<string>> schema0 = default;
             Optional<DataFactoryElement<string>> table = default;
-            IDictionary<string, BinaryData> additionalProperties = default;
-            Dictionary<string, BinaryData> additionalPropertiesDictionary = new Dictionary<string, BinaryData>();
+            IDictionary<string, DataFactoryElement<string>> additionalProperties = default;
+            Dictionary<string, DataFactoryElement<string>> additionalPropertiesDictionary = new Dictionary<string, DataFactoryElement<string>>();
             foreach (var property in element.EnumerateObject())
             {
                 if (property.NameEquals("type"u8))
@@ -240,7 +240,7 @@ internal static AzureSqlDWTableDataset DeserializeAzureSqlDWTableDataset(JsonEle
                     }
                     continue;
                 }
-                additionalPropertiesDictionary.Add(property.Name, BinaryData.FromString(property.Value.GetRawText()));
+                additionalPropertiesDictionary.Add(property.Name, JsonSerializer.Deserialize<DataFactoryElement<string>>(property.Value.GetRawText()));
             }
             additionalProperties = additionalPropertiesDictionary;
             return new AzureSqlDWTableDataset(type, description.Value, structure.Value, schema.Value, linkedServiceName, Optional.ToDictionary(parameters), Optional.ToList(annotations), folder.Value, additionalProperties, tableName.Value, schema0.Value, table.Value);
diff --git a/src/AzureDataFactory.TestingFramework/Generated/Models/AzureSqlDWTableDataset.cs b/src/AzureDataFactory.TestingFramework/Generated/Models/AzureSqlDWTableDataset.cs
index c1aa4868..aa61f06f 100644
--- a/src/AzureDataFactory.TestingFramework/Generated/Models/AzureSqlDWTableDataset.cs
+++ b/src/AzureDataFactory.TestingFramework/Generated/Models/AzureSqlDWTableDataset.cs
@@ -36,7 +36,7 @@ public AzureSqlDWTableDataset(DataFactoryLinkedServiceReference linkedServiceNam
         /// <param name="tableName"> This property will be retired. Please consider using schema + table properties instead. </param>
         /// <param name="schemaTypePropertiesSchema"> The schema name of the Azure SQL Data Warehouse. Type: string (or Expression with resultType string). </param>
         /// <param name="table"> The table name of the Azure SQL Data Warehouse. Type: string (or Expression with resultType string). </param>
-        internal AzureSqlDWTableDataset(string datasetType, string description, DataFactoryElement<IList<DatasetDataElement>> structure, DataFactoryElement<IList<DatasetSchemaDataElement>> schema, DataFactoryLinkedServiceReference linkedServiceName, IDictionary<string, EntityParameterSpecification> parameters, IList<BinaryData> annotations, DatasetFolder folder, IDictionary<string, BinaryData> additionalProperties, BinaryData tableName, DataFactoryElement<string> schemaTypePropertiesSchema, DataFactoryElement<string> table) : base(datasetType, description, structure, schema, linkedServiceName, parameters, annotations, folder, additionalProperties)
+        internal AzureSqlDWTableDataset(string datasetType, string description, DataFactoryElement<IList<DatasetDataElement>> structure, DataFactoryElement<IList<DatasetSchemaDataElement>> schema, DataFactoryLinkedServiceReference linkedServiceName, IDictionary<string, EntityParameterSpecification> parameters, IList<BinaryData> annotations, DatasetFolder folder, IDictionary<string, DataFactoryElement<string>> additionalProperties, BinaryData tableName, DataFactoryElement<string> schemaTypePropertiesSchema, DataFactoryElement<string> table) : base(datasetType, description, structure, schema, linkedServiceName, parameters, annotations, folder, additionalProperties)
         {
             TableName = tableName;
             SchemaTypePropertiesSchema = schemaTypePropertiesSchema;
diff --git a/src/AzureDataFactory.TestingFramework/Generated/Models/AzureSqlDatabaseLinkedService.Serialization.cs b/src/AzureDataFactory.TestingFramework/Generated/Models/AzureSqlDatabaseLinkedService.Serialization.cs
index 1293974e..ecdd10fa 100644
--- a/src/AzureDataFactory.TestingFramework/Generated/Models/AzureSqlDatabaseLinkedService.Serialization.cs
+++ b/src/AzureDataFactory.TestingFramework/Generated/Models/AzureSqlDatabaseLinkedService.Serialization.cs
@@ -135,8 +135,8 @@ internal static AzureSqlDatabaseLinkedService DeserializeAzureSqlDatabaseLinkedS
             Optional<string> encryptedCredential = default;
             Optional<SqlAlwaysEncryptedProperties> alwaysEncryptedSettings = default;
             Optional<DataFactoryCredentialReference> credential = default;
-            IDictionary<string, BinaryData> additionalProperties = default;
-            Dictionary<string, BinaryData> additionalPropertiesDictionary = new Dictionary<string, BinaryData>();
+            IDictionary<string, DataFactoryElement<string>> additionalProperties = default;
+            Dictionary<string, DataFactoryElement<string>> additionalPropertiesDictionary = new Dictionary<string, DataFactoryElement<string>>();
             foreach (var property in element.EnumerateObject())
             {
                 if (property.NameEquals("type"u8))
@@ -278,7 +278,7 @@ internal static AzureSqlDatabaseLinkedService DeserializeAzureSqlDatabaseLinkedS
                     }
                     continue;
                 }
-                additionalPropertiesDictionary.Add(property.Name, BinaryData.FromString(property.Value.GetRawText()));
+                additionalPropertiesDictionary.Add(property.Name, JsonSerializer.Deserialize<DataFactoryElement<string>>(property.Value.GetRawText()));
             }
             additionalProperties = additionalPropertiesDictionary;
             return new AzureSqlDatabaseLinkedService(type, connectVia.Value, description.Value, Optional.ToDictionary(parameters), Optional.ToList(annotations), additionalProperties, connectionString, password, servicePrincipalId.Value, servicePrincipalKey, tenant.Value, azureCloudType.Value, encryptedCredential.Value, alwaysEncryptedSettings.Value, credential.Value);
diff --git a/src/AzureDataFactory.TestingFramework/Generated/Models/AzureSqlDatabaseLinkedService.cs b/src/AzureDataFactory.TestingFramework/Generated/Models/AzureSqlDatabaseLinkedService.cs
index 5b5989b8..49631747 100644
--- a/src/AzureDataFactory.TestingFramework/Generated/Models/AzureSqlDatabaseLinkedService.cs
+++ b/src/AzureDataFactory.TestingFramework/Generated/Models/AzureSqlDatabaseLinkedService.cs
@@ -40,7 +40,7 @@ public AzureSqlDatabaseLinkedService(DataFactoryElement<string> connectionString
         /// <param name="encryptedCredential"> The encrypted credential used for authentication. Credentials are encrypted using the integration runtime credential manager. Type: string. </param>
         /// <param name="alwaysEncryptedSettings"> Sql always encrypted properties. </param>
         /// <param name="credential"> The credential reference containing authentication information. </param>
-        internal AzureSqlDatabaseLinkedService(string linkedServiceType, IntegrationRuntimeReference connectVia, string description, IDictionary<string, EntityParameterSpecification> parameters, IList<BinaryData> annotations, IDictionary<string, BinaryData> additionalProperties, DataFactoryElement<string> connectionString, DataFactoryKeyVaultSecretReference password, DataFactoryElement<string> servicePrincipalId, DataFactorySecretBaseDefinition servicePrincipalKey, DataFactoryElement<string> tenant, DataFactoryElement<string> azureCloudType, string encryptedCredential, SqlAlwaysEncryptedProperties alwaysEncryptedSettings, DataFactoryCredentialReference credential) : base(linkedServiceType, connectVia, description, parameters, annotations, additionalProperties)
+        internal AzureSqlDatabaseLinkedService(string linkedServiceType, IntegrationRuntimeReference connectVia, string description, IDictionary<string, EntityParameterSpecification> parameters, IList<BinaryData> annotations, IDictionary<string, DataFactoryElement<string>> additionalProperties, DataFactoryElement<string> connectionString, DataFactoryKeyVaultSecretReference password, DataFactoryElement<string> servicePrincipalId, DataFactorySecretBaseDefinition servicePrincipalKey, DataFactoryElement<string> tenant, DataFactoryElement<string> azureCloudType, string encryptedCredential, SqlAlwaysEncryptedProperties alwaysEncryptedSettings, DataFactoryCredentialReference credential) : base(linkedServiceType, connectVia, description, parameters, annotations, additionalProperties)
         {
             ConnectionString = connectionString;
             Password = password;
diff --git a/src/AzureDataFactory.TestingFramework/Generated/Models/AzureSqlMILinkedService.Serialization.cs b/src/AzureDataFactory.TestingFramework/Generated/Models/AzureSqlMILinkedService.Serialization.cs
index 233336ed..a1156726 100644
--- a/src/AzureDataFactory.TestingFramework/Generated/Models/AzureSqlMILinkedService.Serialization.cs
+++ b/src/AzureDataFactory.TestingFramework/Generated/Models/AzureSqlMILinkedService.Serialization.cs
@@ -135,8 +135,8 @@ internal static AzureSqlMILinkedService DeserializeAzureSqlMILinkedService(JsonE
             Optional<string> encryptedCredential = default;
             Optional<SqlAlwaysEncryptedProperties> alwaysEncryptedSettings = default;
             Optional<DataFactoryCredentialReference> credential = default;
-            IDictionary<string, BinaryData> additionalProperties = default;
-            Dictionary<string, BinaryData> additionalPropertiesDictionary = new Dictionary<string, BinaryData>();
+            IDictionary<string, DataFactoryElement<string>> additionalProperties = default;
+            Dictionary<string, DataFactoryElement<string>> additionalPropertiesDictionary = new Dictionary<string, DataFactoryElement<string>>();
             foreach (var property in element.EnumerateObject())
             {
                 if (property.NameEquals("type"u8))
@@ -278,7 +278,7 @@ internal static AzureSqlMILinkedService DeserializeAzureSqlMILinkedService(JsonE
                     }
                     continue;
                 }
-                additionalPropertiesDictionary.Add(property.Name, BinaryData.FromString(property.Value.GetRawText()));
+                additionalPropertiesDictionary.Add(property.Name, JsonSerializer.Deserialize<DataFactoryElement<string>>(property.Value.GetRawText()));
             }
             additionalProperties = additionalPropertiesDictionary;
             return new AzureSqlMILinkedService(type, connectVia.Value, description.Value, Optional.ToDictionary(parameters), Optional.ToList(annotations), additionalProperties, connectionString, password, servicePrincipalId.Value, servicePrincipalKey, tenant.Value, azureCloudType.Value, encryptedCredential.Value, alwaysEncryptedSettings.Value, credential.Value);
diff --git a/src/AzureDataFactory.TestingFramework/Generated/Models/AzureSqlMILinkedService.cs b/src/AzureDataFactory.TestingFramework/Generated/Models/AzureSqlMILinkedService.cs
index 60f5cfe6..9b4a2284 100644
--- a/src/AzureDataFactory.TestingFramework/Generated/Models/AzureSqlMILinkedService.cs
+++ b/src/AzureDataFactory.TestingFramework/Generated/Models/AzureSqlMILinkedService.cs
@@ -40,7 +40,7 @@ public AzureSqlMILinkedService(DataFactoryElement<string> connectionString)
         /// <param name="encryptedCredential"> The encrypted credential used for authentication. Credentials are encrypted using the integration runtime credential manager. Type: string. </param>
         /// <param name="alwaysEncryptedSettings"> Sql always encrypted properties. </param>
         /// <param name="credential"> The credential reference containing authentication information. </param>
-        internal AzureSqlMILinkedService(string linkedServiceType, IntegrationRuntimeReference connectVia, string description, IDictionary<string, EntityParameterSpecification> parameters, IList<BinaryData> annotations, IDictionary<string, BinaryData> additionalProperties, DataFactoryElement<string> connectionString, DataFactoryKeyVaultSecretReference password, DataFactoryElement<string> servicePrincipalId, DataFactorySecretBaseDefinition servicePrincipalKey, DataFactoryElement<string> tenant, DataFactoryElement<string> azureCloudType, string encryptedCredential, SqlAlwaysEncryptedProperties alwaysEncryptedSettings, DataFactoryCredentialReference credential) : base(linkedServiceType, connectVia, description, parameters, annotations, additionalProperties)
+        internal AzureSqlMILinkedService(string linkedServiceType, IntegrationRuntimeReference connectVia, string description, IDictionary<string, EntityParameterSpecification> parameters, IList<BinaryData> annotations, IDictionary<string, DataFactoryElement<string>> additionalProperties, DataFactoryElement<string> connectionString, DataFactoryKeyVaultSecretReference password, DataFactoryElement<string> servicePrincipalId, DataFactorySecretBaseDefinition servicePrincipalKey, DataFactoryElement<string> tenant, DataFactoryElement<string> azureCloudType, string encryptedCredential, SqlAlwaysEncryptedProperties alwaysEncryptedSettings, DataFactoryCredentialReference credential) : base(linkedServiceType, connectVia, description, parameters, annotations, additionalProperties)
         {
             ConnectionString = connectionString;
             Password = password;
diff --git a/src/AzureDataFactory.TestingFramework/Generated/Models/AzureSqlMITableDataset.Serialization.cs b/src/AzureDataFactory.TestingFramework/Generated/Models/AzureSqlMITableDataset.Serialization.cs
index b1dd1a13..03f78103 100644
--- a/src/AzureDataFactory.TestingFramework/Generated/Models/AzureSqlMITableDataset.Serialization.cs
+++ b/src/AzureDataFactory.TestingFramework/Generated/Models/AzureSqlMITableDataset.Serialization.cs
@@ -120,8 +120,8 @@ internal static AzureSqlMITableDataset DeserializeAzureSqlMITableDataset(JsonEle
             Optional<BinaryData> tableName = default;
             Optional<DataFactoryElement<string>> schema0 = default;
             Optional<DataFactoryElement<string>> table = default;
-            IDictionary<string, BinaryData> additionalProperties = default;
-            Dictionary<string, BinaryData> additionalPropertiesDictionary = new Dictionary<string, BinaryData>();
+            IDictionary<string, DataFactoryElement<string>> additionalProperties = default;
+            Dictionary<string, DataFactoryElement<string>> additionalPropertiesDictionary = new Dictionary<string, DataFactoryElement<string>>();
             foreach (var property in element.EnumerateObject())
             {
                 if (property.NameEquals("type"u8))
@@ -240,7 +240,7 @@ internal static AzureSqlMITableDataset DeserializeAzureSqlMITableDataset(JsonEle
                     }
                     continue;
                 }
-                additionalPropertiesDictionary.Add(property.Name, BinaryData.FromString(property.Value.GetRawText()));
+                additionalPropertiesDictionary.Add(property.Name, JsonSerializer.Deserialize<DataFactoryElement<string>>(property.Value.GetRawText()));
             }
             additionalProperties = additionalPropertiesDictionary;
             return new AzureSqlMITableDataset(type, description.Value, structure.Value, schema.Value, linkedServiceName, Optional.ToDictionary(parameters), Optional.ToList(annotations), folder.Value, additionalProperties, tableName.Value, schema0.Value, table.Value);
diff --git a/src/AzureDataFactory.TestingFramework/Generated/Models/AzureSqlMITableDataset.cs b/src/AzureDataFactory.TestingFramework/Generated/Models/AzureSqlMITableDataset.cs
index 647a91f8..c8d85ff4 100644
--- a/src/AzureDataFactory.TestingFramework/Generated/Models/AzureSqlMITableDataset.cs
+++ b/src/AzureDataFactory.TestingFramework/Generated/Models/AzureSqlMITableDataset.cs
@@ -36,7 +36,7 @@ public AzureSqlMITableDataset(DataFactoryLinkedServiceReference linkedServiceNam
         /// <param name="tableName"> This property will be retired. Please consider using schema + table properties instead. </param>
         /// <param name="schemaTypePropertiesSchema"> The schema name of the Azure SQL Managed Instance. Type: string (or Expression with resultType string). </param>
         /// <param name="table"> The table name of the Azure SQL Managed Instance dataset. Type: string (or Expression with resultType string). </param>
-        internal AzureSqlMITableDataset(string datasetType, string description, DataFactoryElement<IList<DatasetDataElement>> structure, DataFactoryElement<IList<DatasetSchemaDataElement>> schema, DataFactoryLinkedServiceReference linkedServiceName, IDictionary<string, EntityParameterSpecification> parameters, IList<BinaryData> annotations, DatasetFolder folder, IDictionary<string, BinaryData> additionalProperties, BinaryData tableName, DataFactoryElement<string> schemaTypePropertiesSchema, DataFactoryElement<string> table) : base(datasetType, description, structure, schema, linkedServiceName, parameters, annotations, folder, additionalProperties)
+        internal AzureSqlMITableDataset(string datasetType, string description, DataFactoryElement<IList<DatasetDataElement>> structure, DataFactoryElement<IList<DatasetSchemaDataElement>> schema, DataFactoryLinkedServiceReference linkedServiceName, IDictionary<string, EntityParameterSpecification> parameters, IList<BinaryData> annotations, DatasetFolder folder, IDictionary<string, DataFactoryElement<string>> additionalProperties, BinaryData tableName, DataFactoryElement<string> schemaTypePropertiesSchema, DataFactoryElement<string> table) : base(datasetType, description, structure, schema, linkedServiceName, parameters, annotations, folder, additionalProperties)
         {
             TableName = tableName;
             SchemaTypePropertiesSchema = schemaTypePropertiesSchema;
diff --git a/src/AzureDataFactory.TestingFramework/Generated/Models/AzureSqlSink.Serialization.cs b/src/AzureDataFactory.TestingFramework/Generated/Models/AzureSqlSink.Serialization.cs
index 3efb3eb9..1fa894d2 100644
--- a/src/AzureDataFactory.TestingFramework/Generated/Models/AzureSqlSink.Serialization.cs
+++ b/src/AzureDataFactory.TestingFramework/Generated/Models/AzureSqlSink.Serialization.cs
@@ -135,8 +135,8 @@ internal static AzureSqlSink DeserializeAzureSqlSink(JsonElement element)
             Optional<DataFactoryElement<string>> sinkRetryWait = default;
             Optional<DataFactoryElement<int>> maxConcurrentConnections = default;
             Optional<DataFactoryElement<bool>> disableMetricsCollection = default;
-            IDictionary<string, BinaryData> additionalProperties = default;
-            Dictionary<string, BinaryData> additionalPropertiesDictionary = new Dictionary<string, BinaryData>();
+            IDictionary<string, DataFactoryElement<string>> additionalProperties = default;
+            Dictionary<string, DataFactoryElement<string>> additionalPropertiesDictionary = new Dictionary<string, DataFactoryElement<string>>();
             foreach (var property in element.EnumerateObject())
             {
                 if (property.NameEquals("sqlWriterStoredProcedureName"u8))
@@ -279,7 +279,7 @@ internal static AzureSqlSink DeserializeAzureSqlSink(JsonElement element)
                     disableMetricsCollection = JsonSerializer.Deserialize<DataFactoryElement<bool>>(property.Value.GetRawText());
                     continue;
                 }
-                additionalPropertiesDictionary.Add(property.Name, BinaryData.FromString(property.Value.GetRawText()));
+                additionalPropertiesDictionary.Add(property.Name, JsonSerializer.Deserialize<DataFactoryElement<string>>(property.Value.GetRawText()));
             }
             additionalProperties = additionalPropertiesDictionary;
             return new AzureSqlSink(type, writeBatchSize.Value, writeBatchTimeout.Value, sinkRetryCount.Value, sinkRetryWait.Value, maxConcurrentConnections.Value, disableMetricsCollection.Value, additionalProperties, sqlWriterStoredProcedureName.Value, sqlWriterTableType.Value, preCopyScript.Value, storedProcedureParameters.Value, storedProcedureTableTypeParameterName.Value, tableOption.Value, sqlWriterUseTableLock.Value, writeBehavior.Value, upsertSettings.Value);
diff --git a/src/AzureDataFactory.TestingFramework/Generated/Models/AzureSqlSink.cs b/src/AzureDataFactory.TestingFramework/Generated/Models/AzureSqlSink.cs
index 0d5342e2..fcd088c7 100644
--- a/src/AzureDataFactory.TestingFramework/Generated/Models/AzureSqlSink.cs
+++ b/src/AzureDataFactory.TestingFramework/Generated/Models/AzureSqlSink.cs
@@ -36,7 +36,7 @@ public AzureSqlSink()
         /// <param name="sqlWriterUseTableLock"> Whether to use table lock during bulk copy. Type: boolean (or Expression with resultType boolean). </param>
         /// <param name="writeBehavior"> Write behavior when copying data into Azure SQL. Type: SqlWriteBehaviorEnum (or Expression with resultType SqlWriteBehaviorEnum). </param>
         /// <param name="upsertSettings"> SQL upsert settings. </param>
-        internal AzureSqlSink(string copySinkType, DataFactoryElement<int> writeBatchSize, DataFactoryElement<string> writeBatchTimeout, DataFactoryElement<int> sinkRetryCount, DataFactoryElement<string> sinkRetryWait, DataFactoryElement<int> maxConcurrentConnections, DataFactoryElement<bool> disableMetricsCollection, IDictionary<string, BinaryData> additionalProperties, DataFactoryElement<string> sqlWriterStoredProcedureName, DataFactoryElement<string> sqlWriterTableType, DataFactoryElement<string> preCopyScript, BinaryData storedProcedureParameters, DataFactoryElement<string> storedProcedureTableTypeParameterName, DataFactoryElement<string> tableOption, DataFactoryElement<bool> sqlWriterUseTableLock, BinaryData writeBehavior, SqlUpsertSettings upsertSettings) : base(copySinkType, writeBatchSize, writeBatchTimeout, sinkRetryCount, sinkRetryWait, maxConcurrentConnections, disableMetricsCollection, additionalProperties)
+        internal AzureSqlSink(string copySinkType, DataFactoryElement<int> writeBatchSize, DataFactoryElement<string> writeBatchTimeout, DataFactoryElement<int> sinkRetryCount, DataFactoryElement<string> sinkRetryWait, DataFactoryElement<int> maxConcurrentConnections, DataFactoryElement<bool> disableMetricsCollection, IDictionary<string, DataFactoryElement<string>> additionalProperties, DataFactoryElement<string> sqlWriterStoredProcedureName, DataFactoryElement<string> sqlWriterTableType, DataFactoryElement<string> preCopyScript, BinaryData storedProcedureParameters, DataFactoryElement<string> storedProcedureTableTypeParameterName, DataFactoryElement<string> tableOption, DataFactoryElement<bool> sqlWriterUseTableLock, BinaryData writeBehavior, SqlUpsertSettings upsertSettings) : base(copySinkType, writeBatchSize, writeBatchTimeout, sinkRetryCount, sinkRetryWait, maxConcurrentConnections, disableMetricsCollection, additionalProperties)
         {
             SqlWriterStoredProcedureName = sqlWriterStoredProcedureName;
             SqlWriterTableType = sqlWriterTableType;
diff --git a/src/AzureDataFactory.TestingFramework/Generated/Models/AzureSqlSource.Serialization.cs b/src/AzureDataFactory.TestingFramework/Generated/Models/AzureSqlSource.Serialization.cs
index 88558110..be0b8d13 100644
--- a/src/AzureDataFactory.TestingFramework/Generated/Models/AzureSqlSource.Serialization.cs
+++ b/src/AzureDataFactory.TestingFramework/Generated/Models/AzureSqlSource.Serialization.cs
@@ -131,8 +131,8 @@ internal static AzureSqlSource DeserializeAzureSqlSource(JsonElement element)
             Optional<DataFactoryElement<string>> sourceRetryWait = default;
             Optional<DataFactoryElement<int>> maxConcurrentConnections = default;
             Optional<DataFactoryElement<bool>> disableMetricsCollection = default;
-            IDictionary<string, BinaryData> additionalProperties = default;
-            Dictionary<string, BinaryData> additionalPropertiesDictionary = new Dictionary<string, BinaryData>();
+            IDictionary<string, DataFactoryElement<string>> additionalProperties = default;
+            Dictionary<string, DataFactoryElement<string>> additionalPropertiesDictionary = new Dictionary<string, DataFactoryElement<string>>();
             foreach (var property in element.EnumerateObject())
             {
                 if (property.NameEquals("sqlReaderQuery"u8))
@@ -257,7 +257,7 @@ internal static AzureSqlSource DeserializeAzureSqlSource(JsonElement element)
                     disableMetricsCollection = JsonSerializer.Deserialize<DataFactoryElement<bool>>(property.Value.GetRawText());
                     continue;
                 }
-                additionalPropertiesDictionary.Add(property.Name, BinaryData.FromString(property.Value.GetRawText()));
+                additionalPropertiesDictionary.Add(property.Name, JsonSerializer.Deserialize<DataFactoryElement<string>>(property.Value.GetRawText()));
             }
             additionalProperties = additionalPropertiesDictionary;
             return new AzureSqlSource(type, sourceRetryCount.Value, sourceRetryWait.Value, maxConcurrentConnections.Value, disableMetricsCollection.Value, additionalProperties, queryTimeout.Value, additionalColumns.Value, sqlReaderQuery.Value, sqlReaderStoredProcedureName.Value, storedProcedureParameters.Value, isolationLevel.Value, produceAdditionalTypes.Value, partitionOption.Value, partitionSettings.Value);
diff --git a/src/AzureDataFactory.TestingFramework/Generated/Models/AzureSqlSource.cs b/src/AzureDataFactory.TestingFramework/Generated/Models/AzureSqlSource.cs
index c7538935..4c30806b 100644
--- a/src/AzureDataFactory.TestingFramework/Generated/Models/AzureSqlSource.cs
+++ b/src/AzureDataFactory.TestingFramework/Generated/Models/AzureSqlSource.cs
@@ -34,7 +34,7 @@ public AzureSqlSource()
         /// <param name="produceAdditionalTypes"> Which additional types to produce. </param>
         /// <param name="partitionOption"> The partition mechanism that will be used for Sql read in parallel. Possible values include: "None", "PhysicalPartitionsOfTable", "DynamicRange". </param>
         /// <param name="partitionSettings"> The settings that will be leveraged for Sql source partitioning. </param>
-        internal AzureSqlSource(string copySourceType, DataFactoryElement<int> sourceRetryCount, DataFactoryElement<string> sourceRetryWait, DataFactoryElement<int> maxConcurrentConnections, DataFactoryElement<bool> disableMetricsCollection, IDictionary<string, BinaryData> additionalProperties, DataFactoryElement<string> queryTimeout, BinaryData additionalColumns, DataFactoryElement<string> sqlReaderQuery, DataFactoryElement<string> sqlReaderStoredProcedureName, BinaryData storedProcedureParameters, DataFactoryElement<string> isolationLevel, BinaryData produceAdditionalTypes, BinaryData partitionOption, SqlPartitionSettings partitionSettings) : base(copySourceType, sourceRetryCount, sourceRetryWait, maxConcurrentConnections, disableMetricsCollection, additionalProperties, queryTimeout, additionalColumns)
+        internal AzureSqlSource(string copySourceType, DataFactoryElement<int> sourceRetryCount, DataFactoryElement<string> sourceRetryWait, DataFactoryElement<int> maxConcurrentConnections, DataFactoryElement<bool> disableMetricsCollection, IDictionary<string, DataFactoryElement<string>> additionalProperties, DataFactoryElement<string> queryTimeout, BinaryData additionalColumns, DataFactoryElement<string> sqlReaderQuery, DataFactoryElement<string> sqlReaderStoredProcedureName, BinaryData storedProcedureParameters, DataFactoryElement<string> isolationLevel, BinaryData produceAdditionalTypes, BinaryData partitionOption, SqlPartitionSettings partitionSettings) : base(copySourceType, sourceRetryCount, sourceRetryWait, maxConcurrentConnections, disableMetricsCollection, additionalProperties, queryTimeout, additionalColumns)
         {
             SqlReaderQuery = sqlReaderQuery;
             SqlReaderStoredProcedureName = sqlReaderStoredProcedureName;
diff --git a/src/AzureDataFactory.TestingFramework/Generated/Models/AzureSqlTableDataset.Serialization.cs b/src/AzureDataFactory.TestingFramework/Generated/Models/AzureSqlTableDataset.Serialization.cs
index d43f005b..a4694e9d 100644
--- a/src/AzureDataFactory.TestingFramework/Generated/Models/AzureSqlTableDataset.Serialization.cs
+++ b/src/AzureDataFactory.TestingFramework/Generated/Models/AzureSqlTableDataset.Serialization.cs
@@ -120,8 +120,8 @@ internal static AzureSqlTableDataset DeserializeAzureSqlTableDataset(JsonElement
             Optional<BinaryData> tableName = default;
             Optional<DataFactoryElement<string>> schema0 = default;
             Optional<DataFactoryElement<string>> table = default;
-            IDictionary<string, BinaryData> additionalProperties = default;
-            Dictionary<string, BinaryData> additionalPropertiesDictionary = new Dictionary<string, BinaryData>();
+            IDictionary<string, DataFactoryElement<string>> additionalProperties = default;
+            Dictionary<string, DataFactoryElement<string>> additionalPropertiesDictionary = new Dictionary<string, DataFactoryElement<string>>();
             foreach (var property in element.EnumerateObject())
             {
                 if (property.NameEquals("type"u8))
@@ -240,7 +240,7 @@ internal static AzureSqlTableDataset DeserializeAzureSqlTableDataset(JsonElement
                     }
                     continue;
                 }
-                additionalPropertiesDictionary.Add(property.Name, BinaryData.FromString(property.Value.GetRawText()));
+                additionalPropertiesDictionary.Add(property.Name, JsonSerializer.Deserialize<DataFactoryElement<string>>(property.Value.GetRawText()));
             }
             additionalProperties = additionalPropertiesDictionary;
             return new AzureSqlTableDataset(type, description.Value, structure.Value, schema.Value, linkedServiceName, Optional.ToDictionary(parameters), Optional.ToList(annotations), folder.Value, additionalProperties, tableName.Value, schema0.Value, table.Value);
diff --git a/src/AzureDataFactory.TestingFramework/Generated/Models/AzureSqlTableDataset.cs b/src/AzureDataFactory.TestingFramework/Generated/Models/AzureSqlTableDataset.cs
index c010dd6b..fd18bc3d 100644
--- a/src/AzureDataFactory.TestingFramework/Generated/Models/AzureSqlTableDataset.cs
+++ b/src/AzureDataFactory.TestingFramework/Generated/Models/AzureSqlTableDataset.cs
@@ -36,7 +36,7 @@ public AzureSqlTableDataset(DataFactoryLinkedServiceReference linkedServiceName)
         /// <param name="tableName"> This property will be retired. Please consider using schema + table properties instead. </param>
         /// <param name="schemaTypePropertiesSchema"> The schema name of the Azure SQL database. Type: string (or Expression with resultType string). </param>
         /// <param name="table"> The table name of the Azure SQL database. Type: string (or Expression with resultType string). </param>
-        internal AzureSqlTableDataset(string datasetType, string description, DataFactoryElement<IList<DatasetDataElement>> structure, DataFactoryElement<IList<DatasetSchemaDataElement>> schema, DataFactoryLinkedServiceReference linkedServiceName, IDictionary<string, EntityParameterSpecification> parameters, IList<BinaryData> annotations, DatasetFolder folder, IDictionary<string, BinaryData> additionalProperties, BinaryData tableName, DataFactoryElement<string> schemaTypePropertiesSchema, DataFactoryElement<string> table) : base(datasetType, description, structure, schema, linkedServiceName, parameters, annotations, folder, additionalProperties)
+        internal AzureSqlTableDataset(string datasetType, string description, DataFactoryElement<IList<DatasetDataElement>> structure, DataFactoryElement<IList<DatasetSchemaDataElement>> schema, DataFactoryLinkedServiceReference linkedServiceName, IDictionary<string, EntityParameterSpecification> parameters, IList<BinaryData> annotations, DatasetFolder folder, IDictionary<string, DataFactoryElement<string>> additionalProperties, BinaryData tableName, DataFactoryElement<string> schemaTypePropertiesSchema, DataFactoryElement<string> table) : base(datasetType, description, structure, schema, linkedServiceName, parameters, annotations, folder, additionalProperties)
         {
             TableName = tableName;
             SchemaTypePropertiesSchema = schemaTypePropertiesSchema;
diff --git a/src/AzureDataFactory.TestingFramework/Generated/Models/AzureStorageLinkedService.Serialization.cs b/src/AzureDataFactory.TestingFramework/Generated/Models/AzureStorageLinkedService.Serialization.cs
index 337936b3..a0fd5258 100644
--- a/src/AzureDataFactory.TestingFramework/Generated/Models/AzureStorageLinkedService.Serialization.cs
+++ b/src/AzureDataFactory.TestingFramework/Generated/Models/AzureStorageLinkedService.Serialization.cs
@@ -114,8 +114,8 @@ internal static AzureStorageLinkedService DeserializeAzureStorageLinkedService(J
             Optional<DataFactoryElement<string>> sasUri = default;
             Optional<DataFactoryKeyVaultSecretReference> sasToken = default;
             Optional<string> encryptedCredential = default;
-            IDictionary<string, BinaryData> additionalProperties = default;
-            Dictionary<string, BinaryData> additionalPropertiesDictionary = new Dictionary<string, BinaryData>();
+            IDictionary<string, DataFactoryElement<string>> additionalProperties = default;
+            Dictionary<string, DataFactoryElement<string>> additionalPropertiesDictionary = new Dictionary<string, DataFactoryElement<string>>();
             foreach (var property in element.EnumerateObject())
             {
                 if (property.NameEquals("type"u8))
@@ -225,7 +225,7 @@ internal static AzureStorageLinkedService DeserializeAzureStorageLinkedService(J
                     }
                     continue;
                 }
-                additionalPropertiesDictionary.Add(property.Name, BinaryData.FromString(property.Value.GetRawText()));
+                additionalPropertiesDictionary.Add(property.Name, JsonSerializer.Deserialize<DataFactoryElement<string>>(property.Value.GetRawText()));
             }
             additionalProperties = additionalPropertiesDictionary;
             return new AzureStorageLinkedService(type, connectVia.Value, description.Value, Optional.ToDictionary(parameters), Optional.ToList(annotations), additionalProperties, connectionString.Value, accountKey, sasUri.Value, sasToken, encryptedCredential.Value);
diff --git a/src/AzureDataFactory.TestingFramework/Generated/Models/AzureStorageLinkedService.cs b/src/AzureDataFactory.TestingFramework/Generated/Models/AzureStorageLinkedService.cs
index ded9363c..ca6583df 100644
--- a/src/AzureDataFactory.TestingFramework/Generated/Models/AzureStorageLinkedService.cs
+++ b/src/AzureDataFactory.TestingFramework/Generated/Models/AzureStorageLinkedService.cs
@@ -30,7 +30,7 @@ public AzureStorageLinkedService()
         /// <param name="sasUri"> SAS URI of the Azure Storage resource. It is mutually exclusive with connectionString property. Type: string, SecureString or AzureKeyVaultSecretReference. </param>
         /// <param name="sasToken"> The Azure key vault secret reference of sasToken in sas uri. </param>
         /// <param name="encryptedCredential"> The encrypted credential used for authentication. Credentials are encrypted using the integration runtime credential manager. Type: string. </param>
-        internal AzureStorageLinkedService(string linkedServiceType, IntegrationRuntimeReference connectVia, string description, IDictionary<string, EntityParameterSpecification> parameters, IList<BinaryData> annotations, IDictionary<string, BinaryData> additionalProperties, DataFactoryElement<string> connectionString, DataFactoryKeyVaultSecretReference accountKey, DataFactoryElement<string> sasUri, DataFactoryKeyVaultSecretReference sasToken, string encryptedCredential) : base(linkedServiceType, connectVia, description, parameters, annotations, additionalProperties)
+        internal AzureStorageLinkedService(string linkedServiceType, IntegrationRuntimeReference connectVia, string description, IDictionary<string, EntityParameterSpecification> parameters, IList<BinaryData> annotations, IDictionary<string, DataFactoryElement<string>> additionalProperties, DataFactoryElement<string> connectionString, DataFactoryKeyVaultSecretReference accountKey, DataFactoryElement<string> sasUri, DataFactoryKeyVaultSecretReference sasToken, string encryptedCredential) : base(linkedServiceType, connectVia, description, parameters, annotations, additionalProperties)
         {
             ConnectionString = connectionString;
             AccountKey = accountKey;
diff --git a/src/AzureDataFactory.TestingFramework/Generated/Models/AzureSynapseArtifactsLinkedService.Serialization.cs b/src/AzureDataFactory.TestingFramework/Generated/Models/AzureSynapseArtifactsLinkedService.Serialization.cs
index e6e6318c..bb02dabf 100644
--- a/src/AzureDataFactory.TestingFramework/Generated/Models/AzureSynapseArtifactsLinkedService.Serialization.cs
+++ b/src/AzureDataFactory.TestingFramework/Generated/Models/AzureSynapseArtifactsLinkedService.Serialization.cs
@@ -99,8 +99,8 @@ internal static AzureSynapseArtifactsLinkedService DeserializeAzureSynapseArtifa
             DataFactoryElement<string> endpoint = default;
             Optional<DataFactoryElement<string>> authentication = default;
             Optional<DataFactoryElement<string>> workspaceResourceId = default;
-            IDictionary<string, BinaryData> additionalProperties = default;
-            Dictionary<string, BinaryData> additionalPropertiesDictionary = new Dictionary<string, BinaryData>();
+            IDictionary<string, DataFactoryElement<string>> additionalProperties = default;
+            Dictionary<string, DataFactoryElement<string>> additionalPropertiesDictionary = new Dictionary<string, DataFactoryElement<string>>();
             foreach (var property in element.EnumerateObject())
             {
                 if (property.NameEquals("type"u8))
@@ -192,7 +192,7 @@ internal static AzureSynapseArtifactsLinkedService DeserializeAzureSynapseArtifa
                     }
                     continue;
                 }
-                additionalPropertiesDictionary.Add(property.Name, BinaryData.FromString(property.Value.GetRawText()));
+                additionalPropertiesDictionary.Add(property.Name, JsonSerializer.Deserialize<DataFactoryElement<string>>(property.Value.GetRawText()));
             }
             additionalProperties = additionalPropertiesDictionary;
             return new AzureSynapseArtifactsLinkedService(type, connectVia.Value, description.Value, Optional.ToDictionary(parameters), Optional.ToList(annotations), additionalProperties, endpoint, authentication.Value, workspaceResourceId.Value);
diff --git a/src/AzureDataFactory.TestingFramework/Generated/Models/AzureSynapseArtifactsLinkedService.cs b/src/AzureDataFactory.TestingFramework/Generated/Models/AzureSynapseArtifactsLinkedService.cs
index c9f4534b..adbd8b29 100644
--- a/src/AzureDataFactory.TestingFramework/Generated/Models/AzureSynapseArtifactsLinkedService.cs
+++ b/src/AzureDataFactory.TestingFramework/Generated/Models/AzureSynapseArtifactsLinkedService.cs
@@ -34,7 +34,7 @@ public AzureSynapseArtifactsLinkedService(DataFactoryElement<string> endpoint)
         /// <param name="endpoint"> https://&lt;workspacename&gt;.dev.azuresynapse.net, Azure Synapse Analytics workspace URL. Type: string (or Expression with resultType string). </param>
         /// <param name="authentication"> Required to specify MSI, if using system assigned managed identity as authentication method. Type: string (or Expression with resultType string). </param>
         /// <param name="workspaceResourceId"> The resource ID of the Synapse workspace. The format should be: /subscriptions/{subscriptionID}/resourceGroups/{resourceGroup}/providers/Microsoft.Synapse/workspaces/{workspaceName}. Type: string (or Expression with resultType string). </param>
-        internal AzureSynapseArtifactsLinkedService(string linkedServiceType, IntegrationRuntimeReference connectVia, string description, IDictionary<string, EntityParameterSpecification> parameters, IList<BinaryData> annotations, IDictionary<string, BinaryData> additionalProperties, DataFactoryElement<string> endpoint, DataFactoryElement<string> authentication, DataFactoryElement<string> workspaceResourceId) : base(linkedServiceType, connectVia, description, parameters, annotations, additionalProperties)
+        internal AzureSynapseArtifactsLinkedService(string linkedServiceType, IntegrationRuntimeReference connectVia, string description, IDictionary<string, EntityParameterSpecification> parameters, IList<BinaryData> annotations, IDictionary<string, DataFactoryElement<string>> additionalProperties, DataFactoryElement<string> endpoint, DataFactoryElement<string> authentication, DataFactoryElement<string> workspaceResourceId) : base(linkedServiceType, connectVia, description, parameters, annotations, additionalProperties)
         {
             Endpoint = endpoint;
             Authentication = authentication;
diff --git a/src/AzureDataFactory.TestingFramework/Generated/Models/AzureTableDataset.Serialization.cs b/src/AzureDataFactory.TestingFramework/Generated/Models/AzureTableDataset.Serialization.cs
index 230fd583..8159865a 100644
--- a/src/AzureDataFactory.TestingFramework/Generated/Models/AzureTableDataset.Serialization.cs
+++ b/src/AzureDataFactory.TestingFramework/Generated/Models/AzureTableDataset.Serialization.cs
@@ -101,8 +101,8 @@ internal static AzureTableDataset DeserializeAzureTableDataset(JsonElement eleme
             Optional<IList<BinaryData>> annotations = default;
             Optional<DatasetFolder> folder = default;
             DataFactoryElement<string> tableName = default;
-            IDictionary<string, BinaryData> additionalProperties = default;
-            Dictionary<string, BinaryData> additionalPropertiesDictionary = new Dictionary<string, BinaryData>();
+            IDictionary<string, DataFactoryElement<string>> additionalProperties = default;
+            Dictionary<string, DataFactoryElement<string>> additionalPropertiesDictionary = new Dictionary<string, DataFactoryElement<string>>();
             foreach (var property in element.EnumerateObject())
             {
                 if (property.NameEquals("type"u8))
@@ -199,7 +199,7 @@ internal static AzureTableDataset DeserializeAzureTableDataset(JsonElement eleme
                     }
                     continue;
                 }
-                additionalPropertiesDictionary.Add(property.Name, BinaryData.FromString(property.Value.GetRawText()));
+                additionalPropertiesDictionary.Add(property.Name, JsonSerializer.Deserialize<DataFactoryElement<string>>(property.Value.GetRawText()));
             }
             additionalProperties = additionalPropertiesDictionary;
             return new AzureTableDataset(type, description.Value, structure.Value, schema.Value, linkedServiceName, Optional.ToDictionary(parameters), Optional.ToList(annotations), folder.Value, additionalProperties, tableName);
diff --git a/src/AzureDataFactory.TestingFramework/Generated/Models/AzureTableDataset.cs b/src/AzureDataFactory.TestingFramework/Generated/Models/AzureTableDataset.cs
index f2e7175f..527f3031 100644
--- a/src/AzureDataFactory.TestingFramework/Generated/Models/AzureTableDataset.cs
+++ b/src/AzureDataFactory.TestingFramework/Generated/Models/AzureTableDataset.cs
@@ -37,7 +37,7 @@ public AzureTableDataset(DataFactoryLinkedServiceReference linkedServiceName, Da
         /// <param name="folder"> The folder that this Dataset is in. If not specified, Dataset will appear at the root level. </param>
         /// <param name="additionalProperties"> Additional Properties. </param>
         /// <param name="tableName"> The table name of the Azure Table storage. Type: string (or Expression with resultType string). </param>
-        internal AzureTableDataset(string datasetType, string description, DataFactoryElement<IList<DatasetDataElement>> structure, DataFactoryElement<IList<DatasetSchemaDataElement>> schema, DataFactoryLinkedServiceReference linkedServiceName, IDictionary<string, EntityParameterSpecification> parameters, IList<BinaryData> annotations, DatasetFolder folder, IDictionary<string, BinaryData> additionalProperties, DataFactoryElement<string> tableName) : base(datasetType, description, structure, schema, linkedServiceName, parameters, annotations, folder, additionalProperties)
+        internal AzureTableDataset(string datasetType, string description, DataFactoryElement<IList<DatasetDataElement>> structure, DataFactoryElement<IList<DatasetSchemaDataElement>> schema, DataFactoryLinkedServiceReference linkedServiceName, IDictionary<string, EntityParameterSpecification> parameters, IList<BinaryData> annotations, DatasetFolder folder, IDictionary<string, DataFactoryElement<string>> additionalProperties, DataFactoryElement<string> tableName) : base(datasetType, description, structure, schema, linkedServiceName, parameters, annotations, folder, additionalProperties)
         {
             TableName = tableName;
             DatasetType = datasetType ?? "AzureTable";
diff --git a/src/AzureDataFactory.TestingFramework/Generated/Models/AzureTableSink.Serialization.cs b/src/AzureDataFactory.TestingFramework/Generated/Models/AzureTableSink.Serialization.cs
index 7e079857..b8bea889 100644
--- a/src/AzureDataFactory.TestingFramework/Generated/Models/AzureTableSink.Serialization.cs
+++ b/src/AzureDataFactory.TestingFramework/Generated/Models/AzureTableSink.Serialization.cs
@@ -97,8 +97,8 @@ internal static AzureTableSink DeserializeAzureTableSink(JsonElement element)
             Optional<DataFactoryElement<string>> sinkRetryWait = default;
             Optional<DataFactoryElement<int>> maxConcurrentConnections = default;
             Optional<DataFactoryElement<bool>> disableMetricsCollection = default;
-            IDictionary<string, BinaryData> additionalProperties = default;
-            Dictionary<string, BinaryData> additionalPropertiesDictionary = new Dictionary<string, BinaryData>();
+            IDictionary<string, DataFactoryElement<string>> additionalProperties = default;
+            Dictionary<string, DataFactoryElement<string>> additionalPropertiesDictionary = new Dictionary<string, DataFactoryElement<string>>();
             foreach (var property in element.EnumerateObject())
             {
                 if (property.NameEquals("azureTableDefaultPartitionKeyValue"u8))
@@ -196,7 +196,7 @@ internal static AzureTableSink DeserializeAzureTableSink(JsonElement element)
                     disableMetricsCollection = JsonSerializer.Deserialize<DataFactoryElement<bool>>(property.Value.GetRawText());
                     continue;
                 }
-                additionalPropertiesDictionary.Add(property.Name, BinaryData.FromString(property.Value.GetRawText()));
+                additionalPropertiesDictionary.Add(property.Name, JsonSerializer.Deserialize<DataFactoryElement<string>>(property.Value.GetRawText()));
             }
             additionalProperties = additionalPropertiesDictionary;
             return new AzureTableSink(type, writeBatchSize.Value, writeBatchTimeout.Value, sinkRetryCount.Value, sinkRetryWait.Value, maxConcurrentConnections.Value, disableMetricsCollection.Value, additionalProperties, azureTableDefaultPartitionKeyValue.Value, azureTablePartitionKeyName.Value, azureTableRowKeyName.Value, azureTableInsertType.Value);
diff --git a/src/AzureDataFactory.TestingFramework/Generated/Models/AzureTableSink.cs b/src/AzureDataFactory.TestingFramework/Generated/Models/AzureTableSink.cs
index 486e53e8..653d3caa 100644
--- a/src/AzureDataFactory.TestingFramework/Generated/Models/AzureTableSink.cs
+++ b/src/AzureDataFactory.TestingFramework/Generated/Models/AzureTableSink.cs
@@ -31,7 +31,7 @@ public AzureTableSink()
         /// <param name="azureTablePartitionKeyName"> Azure Table partition key name. Type: string (or Expression with resultType string). </param>
         /// <param name="azureTableRowKeyName"> Azure Table row key name. Type: string (or Expression with resultType string). </param>
         /// <param name="azureTableInsertType"> Azure Table insert type. Type: string (or Expression with resultType string). </param>
-        internal AzureTableSink(string copySinkType, DataFactoryElement<int> writeBatchSize, DataFactoryElement<string> writeBatchTimeout, DataFactoryElement<int> sinkRetryCount, DataFactoryElement<string> sinkRetryWait, DataFactoryElement<int> maxConcurrentConnections, DataFactoryElement<bool> disableMetricsCollection, IDictionary<string, BinaryData> additionalProperties, DataFactoryElement<string> azureTableDefaultPartitionKeyValue, DataFactoryElement<string> azureTablePartitionKeyName, DataFactoryElement<string> azureTableRowKeyName, DataFactoryElement<string> azureTableInsertType) : base(copySinkType, writeBatchSize, writeBatchTimeout, sinkRetryCount, sinkRetryWait, maxConcurrentConnections, disableMetricsCollection, additionalProperties)
+        internal AzureTableSink(string copySinkType, DataFactoryElement<int> writeBatchSize, DataFactoryElement<string> writeBatchTimeout, DataFactoryElement<int> sinkRetryCount, DataFactoryElement<string> sinkRetryWait, DataFactoryElement<int> maxConcurrentConnections, DataFactoryElement<bool> disableMetricsCollection, IDictionary<string, DataFactoryElement<string>> additionalProperties, DataFactoryElement<string> azureTableDefaultPartitionKeyValue, DataFactoryElement<string> azureTablePartitionKeyName, DataFactoryElement<string> azureTableRowKeyName, DataFactoryElement<string> azureTableInsertType) : base(copySinkType, writeBatchSize, writeBatchTimeout, sinkRetryCount, sinkRetryWait, maxConcurrentConnections, disableMetricsCollection, additionalProperties)
         {
             AzureTableDefaultPartitionKeyValue = azureTableDefaultPartitionKeyValue;
             AzureTablePartitionKeyName = azureTablePartitionKeyName;
diff --git a/src/AzureDataFactory.TestingFramework/Generated/Models/AzureTableSource.Serialization.cs b/src/AzureDataFactory.TestingFramework/Generated/Models/AzureTableSource.Serialization.cs
index f4b5e8c1..95ba40b8 100644
--- a/src/AzureDataFactory.TestingFramework/Generated/Models/AzureTableSource.Serialization.cs
+++ b/src/AzureDataFactory.TestingFramework/Generated/Models/AzureTableSource.Serialization.cs
@@ -89,8 +89,8 @@ internal static AzureTableSource DeserializeAzureTableSource(JsonElement element
             Optional<DataFactoryElement<string>> sourceRetryWait = default;
             Optional<DataFactoryElement<int>> maxConcurrentConnections = default;
             Optional<DataFactoryElement<bool>> disableMetricsCollection = default;
-            IDictionary<string, BinaryData> additionalProperties = default;
-            Dictionary<string, BinaryData> additionalPropertiesDictionary = new Dictionary<string, BinaryData>();
+            IDictionary<string, DataFactoryElement<string>> additionalProperties = default;
+            Dictionary<string, DataFactoryElement<string>> additionalPropertiesDictionary = new Dictionary<string, DataFactoryElement<string>>();
             foreach (var property in element.EnumerateObject())
             {
                 if (property.NameEquals("azureTableSourceQuery"u8))
@@ -170,7 +170,7 @@ internal static AzureTableSource DeserializeAzureTableSource(JsonElement element
                     disableMetricsCollection = JsonSerializer.Deserialize<DataFactoryElement<bool>>(property.Value.GetRawText());
                     continue;
                 }
-                additionalPropertiesDictionary.Add(property.Name, BinaryData.FromString(property.Value.GetRawText()));
+                additionalPropertiesDictionary.Add(property.Name, JsonSerializer.Deserialize<DataFactoryElement<string>>(property.Value.GetRawText()));
             }
             additionalProperties = additionalPropertiesDictionary;
             return new AzureTableSource(type, sourceRetryCount.Value, sourceRetryWait.Value, maxConcurrentConnections.Value, disableMetricsCollection.Value, additionalProperties, queryTimeout.Value, additionalColumns.Value, azureTableSourceQuery.Value, azureTableSourceIgnoreTableNotFound.Value);
diff --git a/src/AzureDataFactory.TestingFramework/Generated/Models/AzureTableSource.cs b/src/AzureDataFactory.TestingFramework/Generated/Models/AzureTableSource.cs
index 64eccacf..21dc408d 100644
--- a/src/AzureDataFactory.TestingFramework/Generated/Models/AzureTableSource.cs
+++ b/src/AzureDataFactory.TestingFramework/Generated/Models/AzureTableSource.cs
@@ -29,7 +29,7 @@ public AzureTableSource()
         /// <param name="additionalColumns"> Specifies the additional columns to be added to source data. Type: array of objects(AdditionalColumns) (or Expression with resultType array of objects). </param>
         /// <param name="azureTableSourceQuery"> Azure Table source query. Type: string (or Expression with resultType string). </param>
         /// <param name="azureTableSourceIgnoreTableNotFound"> Azure Table source ignore table not found. Type: boolean (or Expression with resultType boolean). </param>
-        internal AzureTableSource(string copySourceType, DataFactoryElement<int> sourceRetryCount, DataFactoryElement<string> sourceRetryWait, DataFactoryElement<int> maxConcurrentConnections, DataFactoryElement<bool> disableMetricsCollection, IDictionary<string, BinaryData> additionalProperties, DataFactoryElement<string> queryTimeout, BinaryData additionalColumns, DataFactoryElement<string> azureTableSourceQuery, DataFactoryElement<bool> azureTableSourceIgnoreTableNotFound) : base(copySourceType, sourceRetryCount, sourceRetryWait, maxConcurrentConnections, disableMetricsCollection, additionalProperties, queryTimeout, additionalColumns)
+        internal AzureTableSource(string copySourceType, DataFactoryElement<int> sourceRetryCount, DataFactoryElement<string> sourceRetryWait, DataFactoryElement<int> maxConcurrentConnections, DataFactoryElement<bool> disableMetricsCollection, IDictionary<string, DataFactoryElement<string>> additionalProperties, DataFactoryElement<string> queryTimeout, BinaryData additionalColumns, DataFactoryElement<string> azureTableSourceQuery, DataFactoryElement<bool> azureTableSourceIgnoreTableNotFound) : base(copySourceType, sourceRetryCount, sourceRetryWait, maxConcurrentConnections, disableMetricsCollection, additionalProperties, queryTimeout, additionalColumns)
         {
             AzureTableSourceQuery = azureTableSourceQuery;
             AzureTableSourceIgnoreTableNotFound = azureTableSourceIgnoreTableNotFound;
diff --git a/src/AzureDataFactory.TestingFramework/Generated/Models/AzureTableStorageLinkedService.Serialization.cs b/src/AzureDataFactory.TestingFramework/Generated/Models/AzureTableStorageLinkedService.Serialization.cs
index 15d4a72e..be731a3a 100644
--- a/src/AzureDataFactory.TestingFramework/Generated/Models/AzureTableStorageLinkedService.Serialization.cs
+++ b/src/AzureDataFactory.TestingFramework/Generated/Models/AzureTableStorageLinkedService.Serialization.cs
@@ -114,8 +114,8 @@ internal static AzureTableStorageLinkedService DeserializeAzureTableStorageLinke
             Optional<DataFactoryElement<string>> sasUri = default;
             Optional<DataFactoryKeyVaultSecretReference> sasToken = default;
             Optional<string> encryptedCredential = default;
-            IDictionary<string, BinaryData> additionalProperties = default;
-            Dictionary<string, BinaryData> additionalPropertiesDictionary = new Dictionary<string, BinaryData>();
+            IDictionary<string, DataFactoryElement<string>> additionalProperties = default;
+            Dictionary<string, DataFactoryElement<string>> additionalPropertiesDictionary = new Dictionary<string, DataFactoryElement<string>>();
             foreach (var property in element.EnumerateObject())
             {
                 if (property.NameEquals("type"u8))
@@ -225,7 +225,7 @@ internal static AzureTableStorageLinkedService DeserializeAzureTableStorageLinke
                     }
                     continue;
                 }
-                additionalPropertiesDictionary.Add(property.Name, BinaryData.FromString(property.Value.GetRawText()));
+                additionalPropertiesDictionary.Add(property.Name, JsonSerializer.Deserialize<DataFactoryElement<string>>(property.Value.GetRawText()));
             }
             additionalProperties = additionalPropertiesDictionary;
             return new AzureTableStorageLinkedService(type, connectVia.Value, description.Value, Optional.ToDictionary(parameters), Optional.ToList(annotations), additionalProperties, connectionString.Value, accountKey, sasUri.Value, sasToken, encryptedCredential.Value);
diff --git a/src/AzureDataFactory.TestingFramework/Generated/Models/AzureTableStorageLinkedService.cs b/src/AzureDataFactory.TestingFramework/Generated/Models/AzureTableStorageLinkedService.cs
index 8ca12901..ed23d78c 100644
--- a/src/AzureDataFactory.TestingFramework/Generated/Models/AzureTableStorageLinkedService.cs
+++ b/src/AzureDataFactory.TestingFramework/Generated/Models/AzureTableStorageLinkedService.cs
@@ -30,7 +30,7 @@ public AzureTableStorageLinkedService()
         /// <param name="sasUri"> SAS URI of the Azure Storage resource. It is mutually exclusive with connectionString property. Type: string, SecureString or AzureKeyVaultSecretReference. </param>
         /// <param name="sasToken"> The Azure key vault secret reference of sasToken in sas uri. </param>
         /// <param name="encryptedCredential"> The encrypted credential used for authentication. Credentials are encrypted using the integration runtime credential manager. Type: string. </param>
-        internal AzureTableStorageLinkedService(string linkedServiceType, IntegrationRuntimeReference connectVia, string description, IDictionary<string, EntityParameterSpecification> parameters, IList<BinaryData> annotations, IDictionary<string, BinaryData> additionalProperties, DataFactoryElement<string> connectionString, DataFactoryKeyVaultSecretReference accountKey, DataFactoryElement<string> sasUri, DataFactoryKeyVaultSecretReference sasToken, string encryptedCredential) : base(linkedServiceType, connectVia, description, parameters, annotations, additionalProperties)
+        internal AzureTableStorageLinkedService(string linkedServiceType, IntegrationRuntimeReference connectVia, string description, IDictionary<string, EntityParameterSpecification> parameters, IList<BinaryData> annotations, IDictionary<string, DataFactoryElement<string>> additionalProperties, DataFactoryElement<string> connectionString, DataFactoryKeyVaultSecretReference accountKey, DataFactoryElement<string> sasUri, DataFactoryKeyVaultSecretReference sasToken, string encryptedCredential) : base(linkedServiceType, connectVia, description, parameters, annotations, additionalProperties)
         {
             ConnectionString = connectionString;
             AccountKey = accountKey;
diff --git a/src/AzureDataFactory.TestingFramework/Generated/Models/BinaryDataset.Serialization.cs b/src/AzureDataFactory.TestingFramework/Generated/Models/BinaryDataset.Serialization.cs
index 356324e7..c3d97e72 100644
--- a/src/AzureDataFactory.TestingFramework/Generated/Models/BinaryDataset.Serialization.cs
+++ b/src/AzureDataFactory.TestingFramework/Generated/Models/BinaryDataset.Serialization.cs
@@ -110,8 +110,8 @@ internal static BinaryDataset DeserializeBinaryDataset(JsonElement element)
             Optional<DatasetFolder> folder = default;
             Optional<DatasetLocation> location = default;
             Optional<DatasetCompression> compression = default;
-            IDictionary<string, BinaryData> additionalProperties = default;
-            Dictionary<string, BinaryData> additionalPropertiesDictionary = new Dictionary<string, BinaryData>();
+            IDictionary<string, DataFactoryElement<string>> additionalProperties = default;
+            Dictionary<string, DataFactoryElement<string>> additionalPropertiesDictionary = new Dictionary<string, DataFactoryElement<string>>();
             foreach (var property in element.EnumerateObject())
             {
                 if (property.NameEquals("type"u8))
@@ -221,7 +221,7 @@ internal static BinaryDataset DeserializeBinaryDataset(JsonElement element)
                     }
                     continue;
                 }
-                additionalPropertiesDictionary.Add(property.Name, BinaryData.FromString(property.Value.GetRawText()));
+                additionalPropertiesDictionary.Add(property.Name, JsonSerializer.Deserialize<DataFactoryElement<string>>(property.Value.GetRawText()));
             }
             additionalProperties = additionalPropertiesDictionary;
             return new BinaryDataset(type, description.Value, structure.Value, schema.Value, linkedServiceName, Optional.ToDictionary(parameters), Optional.ToList(annotations), folder.Value, additionalProperties, location.Value, compression.Value);
diff --git a/src/AzureDataFactory.TestingFramework/Generated/Models/BinaryDataset.cs b/src/AzureDataFactory.TestingFramework/Generated/Models/BinaryDataset.cs
index b3879d68..a203dec9 100644
--- a/src/AzureDataFactory.TestingFramework/Generated/Models/BinaryDataset.cs
+++ b/src/AzureDataFactory.TestingFramework/Generated/Models/BinaryDataset.cs
@@ -39,7 +39,7 @@ public BinaryDataset(DataFactoryLinkedServiceReference linkedServiceName) : base
         /// The available derived classes include <see cref="AmazonS3CompatibleLocation"/>, <see cref="AmazonS3Location"/>, <see cref="AzureBlobFSLocation"/>, <see cref="AzureBlobStorageLocation"/>, <see cref="AzureDataLakeStoreLocation"/>, <see cref="AzureFileStorageLocation"/>, <see cref="FileServerLocation"/>, <see cref="FtpServerLocation"/>, <see cref="GoogleCloudStorageLocation"/>, <see cref="HdfsLocation"/>, <see cref="HttpServerLocation"/>, <see cref="OracleCloudStorageLocation"/> and <see cref="SftpLocation"/>.
         /// </param>
         /// <param name="compression"> The data compression method used for the binary dataset. </param>
-        internal BinaryDataset(string datasetType, string description, DataFactoryElement<IList<DatasetDataElement>> structure, DataFactoryElement<IList<DatasetSchemaDataElement>> schema, DataFactoryLinkedServiceReference linkedServiceName, IDictionary<string, EntityParameterSpecification> parameters, IList<BinaryData> annotations, DatasetFolder folder, IDictionary<string, BinaryData> additionalProperties, DatasetLocation dataLocation, DatasetCompression compression) : base(datasetType, description, structure, schema, linkedServiceName, parameters, annotations, folder, additionalProperties)
+        internal BinaryDataset(string datasetType, string description, DataFactoryElement<IList<DatasetDataElement>> structure, DataFactoryElement<IList<DatasetSchemaDataElement>> schema, DataFactoryLinkedServiceReference linkedServiceName, IDictionary<string, EntityParameterSpecification> parameters, IList<BinaryData> annotations, DatasetFolder folder, IDictionary<string, DataFactoryElement<string>> additionalProperties, DatasetLocation dataLocation, DatasetCompression compression) : base(datasetType, description, structure, schema, linkedServiceName, parameters, annotations, folder, additionalProperties)
         {
             DataLocation = dataLocation;
             Compression = compression;
diff --git a/src/AzureDataFactory.TestingFramework/Generated/Models/BinaryReadSettings.Serialization.cs b/src/AzureDataFactory.TestingFramework/Generated/Models/BinaryReadSettings.Serialization.cs
index 1f6ce329..b6ce4645 100644
--- a/src/AzureDataFactory.TestingFramework/Generated/Models/BinaryReadSettings.Serialization.cs
+++ b/src/AzureDataFactory.TestingFramework/Generated/Models/BinaryReadSettings.Serialization.cs
@@ -7,6 +7,7 @@
 
 using System.Text.Json;
 using Azure.Core;
+using Azure.Core.Expressions.DataFactory;
 
 namespace AzureDataFactory.TestingFramework.Models
 {
@@ -42,8 +43,8 @@ internal static BinaryReadSettings DeserializeBinaryReadSettings(JsonElement ele
             }
             Optional<CompressionReadSettings> compressionProperties = default;
             string type = default;
-            IDictionary<string, BinaryData> additionalProperties = default;
-            Dictionary<string, BinaryData> additionalPropertiesDictionary = new Dictionary<string, BinaryData>();
+            IDictionary<string, DataFactoryElement<string>> additionalProperties = default;
+            Dictionary<string, DataFactoryElement<string>> additionalPropertiesDictionary = new Dictionary<string, DataFactoryElement<string>>();
             foreach (var property in element.EnumerateObject())
             {
                 if (property.NameEquals("compressionProperties"u8))
@@ -60,7 +61,7 @@ internal static BinaryReadSettings DeserializeBinaryReadSettings(JsonElement ele
                     type = property.Value.GetString();
                     continue;
                 }
-                additionalPropertiesDictionary.Add(property.Name, BinaryData.FromString(property.Value.GetRawText()));
+                additionalPropertiesDictionary.Add(property.Name, JsonSerializer.Deserialize<DataFactoryElement<string>>(property.Value.GetRawText()));
             }
             additionalProperties = additionalPropertiesDictionary;
             return new BinaryReadSettings(type, additionalProperties, compressionProperties.Value);
diff --git a/src/AzureDataFactory.TestingFramework/Generated/Models/BinaryReadSettings.cs b/src/AzureDataFactory.TestingFramework/Generated/Models/BinaryReadSettings.cs
index f2758f7c..bce939d6 100644
--- a/src/AzureDataFactory.TestingFramework/Generated/Models/BinaryReadSettings.cs
+++ b/src/AzureDataFactory.TestingFramework/Generated/Models/BinaryReadSettings.cs
@@ -5,6 +5,8 @@
 
 #nullable disable
 
+using Azure.Core.Expressions.DataFactory;
+
 namespace AzureDataFactory.TestingFramework.Models
 {
     /// <summary> Binary read settings. </summary>
@@ -24,7 +26,7 @@ public BinaryReadSettings()
         /// Please note <see cref="CompressionReadSettings"/> is the base class. According to the scenario, a derived class of the base class might need to be assigned here, or this property needs to be casted to one of the possible derived classes.
         /// The available derived classes include <see cref="TarGzipReadSettings"/>, <see cref="TarReadSettings"/> and <see cref="ZipDeflateReadSettings"/>.
         /// </param>
-        internal BinaryReadSettings(string formatReadSettingsType, IDictionary<string, BinaryData> additionalProperties, CompressionReadSettings compressionProperties) : base(formatReadSettingsType, additionalProperties)
+        internal BinaryReadSettings(string formatReadSettingsType, IDictionary<string, DataFactoryElement<string>> additionalProperties, CompressionReadSettings compressionProperties) : base(formatReadSettingsType, additionalProperties)
         {
             CompressionProperties = compressionProperties;
             FormatReadSettingsType = formatReadSettingsType ?? "BinaryReadSettings";
diff --git a/src/AzureDataFactory.TestingFramework/Generated/Models/BinarySink.Serialization.cs b/src/AzureDataFactory.TestingFramework/Generated/Models/BinarySink.Serialization.cs
index 724843eb..44ce735c 100644
--- a/src/AzureDataFactory.TestingFramework/Generated/Models/BinarySink.Serialization.cs
+++ b/src/AzureDataFactory.TestingFramework/Generated/Models/BinarySink.Serialization.cs
@@ -79,8 +79,8 @@ internal static BinarySink DeserializeBinarySink(JsonElement element)
             Optional<DataFactoryElement<string>> sinkRetryWait = default;
             Optional<DataFactoryElement<int>> maxConcurrentConnections = default;
             Optional<DataFactoryElement<bool>> disableMetricsCollection = default;
-            IDictionary<string, BinaryData> additionalProperties = default;
-            Dictionary<string, BinaryData> additionalPropertiesDictionary = new Dictionary<string, BinaryData>();
+            IDictionary<string, DataFactoryElement<string>> additionalProperties = default;
+            Dictionary<string, DataFactoryElement<string>> additionalPropertiesDictionary = new Dictionary<string, DataFactoryElement<string>>();
             foreach (var property in element.EnumerateObject())
             {
                 if (property.NameEquals("storeSettings"u8))
@@ -151,7 +151,7 @@ internal static BinarySink DeserializeBinarySink(JsonElement element)
                     disableMetricsCollection = JsonSerializer.Deserialize<DataFactoryElement<bool>>(property.Value.GetRawText());
                     continue;
                 }
-                additionalPropertiesDictionary.Add(property.Name, BinaryData.FromString(property.Value.GetRawText()));
+                additionalPropertiesDictionary.Add(property.Name, JsonSerializer.Deserialize<DataFactoryElement<string>>(property.Value.GetRawText()));
             }
             additionalProperties = additionalPropertiesDictionary;
             return new BinarySink(type, writeBatchSize.Value, writeBatchTimeout.Value, sinkRetryCount.Value, sinkRetryWait.Value, maxConcurrentConnections.Value, disableMetricsCollection.Value, additionalProperties, storeSettings.Value);
diff --git a/src/AzureDataFactory.TestingFramework/Generated/Models/BinarySink.cs b/src/AzureDataFactory.TestingFramework/Generated/Models/BinarySink.cs
index 17f3b343..974c203c 100644
--- a/src/AzureDataFactory.TestingFramework/Generated/Models/BinarySink.cs
+++ b/src/AzureDataFactory.TestingFramework/Generated/Models/BinarySink.cs
@@ -32,7 +32,7 @@ public BinarySink()
         /// Please note <see cref="StoreWriteSettings"/> is the base class. According to the scenario, a derived class of the base class might need to be assigned here, or this property needs to be casted to one of the possible derived classes.
         /// The available derived classes include <see cref="AzureBlobFSWriteSettings"/>, <see cref="AzureBlobStorageWriteSettings"/>, <see cref="AzureDataLakeStoreWriteSettings"/>, <see cref="AzureFileStorageWriteSettings"/>, <see cref="FileServerWriteSettings"/> and <see cref="SftpWriteSettings"/>.
         /// </param>
-        internal BinarySink(string copySinkType, DataFactoryElement<int> writeBatchSize, DataFactoryElement<string> writeBatchTimeout, DataFactoryElement<int> sinkRetryCount, DataFactoryElement<string> sinkRetryWait, DataFactoryElement<int> maxConcurrentConnections, DataFactoryElement<bool> disableMetricsCollection, IDictionary<string, BinaryData> additionalProperties, StoreWriteSettings storeSettings) : base(copySinkType, writeBatchSize, writeBatchTimeout, sinkRetryCount, sinkRetryWait, maxConcurrentConnections, disableMetricsCollection, additionalProperties)
+        internal BinarySink(string copySinkType, DataFactoryElement<int> writeBatchSize, DataFactoryElement<string> writeBatchTimeout, DataFactoryElement<int> sinkRetryCount, DataFactoryElement<string> sinkRetryWait, DataFactoryElement<int> maxConcurrentConnections, DataFactoryElement<bool> disableMetricsCollection, IDictionary<string, DataFactoryElement<string>> additionalProperties, StoreWriteSettings storeSettings) : base(copySinkType, writeBatchSize, writeBatchTimeout, sinkRetryCount, sinkRetryWait, maxConcurrentConnections, disableMetricsCollection, additionalProperties)
         {
             StoreSettings = storeSettings;
             CopySinkType = copySinkType ?? "BinarySink";
diff --git a/src/AzureDataFactory.TestingFramework/Generated/Models/BinarySource.Serialization.cs b/src/AzureDataFactory.TestingFramework/Generated/Models/BinarySource.Serialization.cs
index 6285b64a..54f4a832 100644
--- a/src/AzureDataFactory.TestingFramework/Generated/Models/BinarySource.Serialization.cs
+++ b/src/AzureDataFactory.TestingFramework/Generated/Models/BinarySource.Serialization.cs
@@ -73,8 +73,8 @@ internal static BinarySource DeserializeBinarySource(JsonElement element)
             Optional<DataFactoryElement<string>> sourceRetryWait = default;
             Optional<DataFactoryElement<int>> maxConcurrentConnections = default;
             Optional<DataFactoryElement<bool>> disableMetricsCollection = default;
-            IDictionary<string, BinaryData> additionalProperties = default;
-            Dictionary<string, BinaryData> additionalPropertiesDictionary = new Dictionary<string, BinaryData>();
+            IDictionary<string, DataFactoryElement<string>> additionalProperties = default;
+            Dictionary<string, DataFactoryElement<string>> additionalPropertiesDictionary = new Dictionary<string, DataFactoryElement<string>>();
             foreach (var property in element.EnumerateObject())
             {
                 if (property.NameEquals("storeSettings"u8))
@@ -136,7 +136,7 @@ internal static BinarySource DeserializeBinarySource(JsonElement element)
                     disableMetricsCollection = JsonSerializer.Deserialize<DataFactoryElement<bool>>(property.Value.GetRawText());
                     continue;
                 }
-                additionalPropertiesDictionary.Add(property.Name, BinaryData.FromString(property.Value.GetRawText()));
+                additionalPropertiesDictionary.Add(property.Name, JsonSerializer.Deserialize<DataFactoryElement<string>>(property.Value.GetRawText()));
             }
             additionalProperties = additionalPropertiesDictionary;
             return new BinarySource(type, sourceRetryCount.Value, sourceRetryWait.Value, maxConcurrentConnections.Value, disableMetricsCollection.Value, additionalProperties, storeSettings.Value, formatSettings.Value);
diff --git a/src/AzureDataFactory.TestingFramework/Generated/Models/BinarySource.cs b/src/AzureDataFactory.TestingFramework/Generated/Models/BinarySource.cs
index 5f4073e6..0ab96ef3 100644
--- a/src/AzureDataFactory.TestingFramework/Generated/Models/BinarySource.cs
+++ b/src/AzureDataFactory.TestingFramework/Generated/Models/BinarySource.cs
@@ -31,7 +31,7 @@ public BinarySource()
         /// The available derived classes include <see cref="AmazonS3CompatibleReadSettings"/>, <see cref="AmazonS3ReadSettings"/>, <see cref="AzureBlobFSReadSettings"/>, <see cref="AzureBlobStorageReadSettings"/>, <see cref="AzureDataLakeStoreReadSettings"/>, <see cref="AzureFileStorageReadSettings"/>, <see cref="FileServerReadSettings"/>, <see cref="FtpReadSettings"/>, <see cref="GoogleCloudStorageReadSettings"/>, <see cref="HdfsReadSettings"/>, <see cref="HttpReadSettings"/>, <see cref="OracleCloudStorageReadSettings"/> and <see cref="SftpReadSettings"/>.
         /// </param>
         /// <param name="formatSettings"> Binary format settings. </param>
-        internal BinarySource(string copySourceType, DataFactoryElement<int> sourceRetryCount, DataFactoryElement<string> sourceRetryWait, DataFactoryElement<int> maxConcurrentConnections, DataFactoryElement<bool> disableMetricsCollection, IDictionary<string, BinaryData> additionalProperties, StoreReadSettings storeSettings, BinaryReadSettings formatSettings) : base(copySourceType, sourceRetryCount, sourceRetryWait, maxConcurrentConnections, disableMetricsCollection, additionalProperties)
+        internal BinarySource(string copySourceType, DataFactoryElement<int> sourceRetryCount, DataFactoryElement<string> sourceRetryWait, DataFactoryElement<int> maxConcurrentConnections, DataFactoryElement<bool> disableMetricsCollection, IDictionary<string, DataFactoryElement<string>> additionalProperties, StoreReadSettings storeSettings, BinaryReadSettings formatSettings) : base(copySourceType, sourceRetryCount, sourceRetryWait, maxConcurrentConnections, disableMetricsCollection, additionalProperties)
         {
             StoreSettings = storeSettings;
             FormatSettings = formatSettings;
diff --git a/src/AzureDataFactory.TestingFramework/Generated/Models/CassandraLinkedService.Serialization.cs b/src/AzureDataFactory.TestingFramework/Generated/Models/CassandraLinkedService.Serialization.cs
index c8467165..7d108864 100644
--- a/src/AzureDataFactory.TestingFramework/Generated/Models/CassandraLinkedService.Serialization.cs
+++ b/src/AzureDataFactory.TestingFramework/Generated/Models/CassandraLinkedService.Serialization.cs
@@ -117,8 +117,8 @@ internal static CassandraLinkedService DeserializeCassandraLinkedService(JsonEle
             Optional<DataFactoryElement<string>> username = default;
             Optional<DataFactorySecretBaseDefinition> password = default;
             Optional<string> encryptedCredential = default;
-            IDictionary<string, BinaryData> additionalProperties = default;
-            Dictionary<string, BinaryData> additionalPropertiesDictionary = new Dictionary<string, BinaryData>();
+            IDictionary<string, DataFactoryElement<string>> additionalProperties = default;
+            Dictionary<string, DataFactoryElement<string>> additionalPropertiesDictionary = new Dictionary<string, DataFactoryElement<string>>();
             foreach (var property in element.EnumerateObject())
             {
                 if (property.NameEquals("type"u8))
@@ -233,7 +233,7 @@ internal static CassandraLinkedService DeserializeCassandraLinkedService(JsonEle
                     }
                     continue;
                 }
-                additionalPropertiesDictionary.Add(property.Name, BinaryData.FromString(property.Value.GetRawText()));
+                additionalPropertiesDictionary.Add(property.Name, JsonSerializer.Deserialize<DataFactoryElement<string>>(property.Value.GetRawText()));
             }
             additionalProperties = additionalPropertiesDictionary;
             return new CassandraLinkedService(type, connectVia.Value, description.Value, Optional.ToDictionary(parameters), Optional.ToList(annotations), additionalProperties, host, authenticationType.Value, port.Value, username.Value, password, encryptedCredential.Value);
diff --git a/src/AzureDataFactory.TestingFramework/Generated/Models/CassandraLinkedService.cs b/src/AzureDataFactory.TestingFramework/Generated/Models/CassandraLinkedService.cs
index a26c5c24..97b7083e 100644
--- a/src/AzureDataFactory.TestingFramework/Generated/Models/CassandraLinkedService.cs
+++ b/src/AzureDataFactory.TestingFramework/Generated/Models/CassandraLinkedService.cs
@@ -37,7 +37,7 @@ public CassandraLinkedService(DataFactoryElement<string> host)
         /// <param name="username"> Username for authentication. Type: string (or Expression with resultType string). </param>
         /// <param name="password"> Password for authentication. </param>
         /// <param name="encryptedCredential"> The encrypted credential used for authentication. Credentials are encrypted using the integration runtime credential manager. Type: string. </param>
-        internal CassandraLinkedService(string linkedServiceType, IntegrationRuntimeReference connectVia, string description, IDictionary<string, EntityParameterSpecification> parameters, IList<BinaryData> annotations, IDictionary<string, BinaryData> additionalProperties, DataFactoryElement<string> host, DataFactoryElement<string> authenticationType, DataFactoryElement<int> port, DataFactoryElement<string> username, DataFactorySecretBaseDefinition password, string encryptedCredential) : base(linkedServiceType, connectVia, description, parameters, annotations, additionalProperties)
+        internal CassandraLinkedService(string linkedServiceType, IntegrationRuntimeReference connectVia, string description, IDictionary<string, EntityParameterSpecification> parameters, IList<BinaryData> annotations, IDictionary<string, DataFactoryElement<string>> additionalProperties, DataFactoryElement<string> host, DataFactoryElement<string> authenticationType, DataFactoryElement<int> port, DataFactoryElement<string> username, DataFactorySecretBaseDefinition password, string encryptedCredential) : base(linkedServiceType, connectVia, description, parameters, annotations, additionalProperties)
         {
             Host = host;
             AuthenticationType = authenticationType;
diff --git a/src/AzureDataFactory.TestingFramework/Generated/Models/CassandraSource.Serialization.cs b/src/AzureDataFactory.TestingFramework/Generated/Models/CassandraSource.Serialization.cs
index 8a402368..acb7632c 100644
--- a/src/AzureDataFactory.TestingFramework/Generated/Models/CassandraSource.Serialization.cs
+++ b/src/AzureDataFactory.TestingFramework/Generated/Models/CassandraSource.Serialization.cs
@@ -89,8 +89,8 @@ internal static CassandraSource DeserializeCassandraSource(JsonElement element)
             Optional<DataFactoryElement<string>> sourceRetryWait = default;
             Optional<DataFactoryElement<int>> maxConcurrentConnections = default;
             Optional<DataFactoryElement<bool>> disableMetricsCollection = default;
-            IDictionary<string, BinaryData> additionalProperties = default;
-            Dictionary<string, BinaryData> additionalPropertiesDictionary = new Dictionary<string, BinaryData>();
+            IDictionary<string, DataFactoryElement<string>> additionalProperties = default;
+            Dictionary<string, DataFactoryElement<string>> additionalPropertiesDictionary = new Dictionary<string, DataFactoryElement<string>>();
             foreach (var property in element.EnumerateObject())
             {
                 if (property.NameEquals("query"u8))
@@ -170,7 +170,7 @@ internal static CassandraSource DeserializeCassandraSource(JsonElement element)
                     disableMetricsCollection = JsonSerializer.Deserialize<DataFactoryElement<bool>>(property.Value.GetRawText());
                     continue;
                 }
-                additionalPropertiesDictionary.Add(property.Name, BinaryData.FromString(property.Value.GetRawText()));
+                additionalPropertiesDictionary.Add(property.Name, JsonSerializer.Deserialize<DataFactoryElement<string>>(property.Value.GetRawText()));
             }
             additionalProperties = additionalPropertiesDictionary;
             return new CassandraSource(type, sourceRetryCount.Value, sourceRetryWait.Value, maxConcurrentConnections.Value, disableMetricsCollection.Value, additionalProperties, queryTimeout.Value, additionalColumns.Value, query.Value, Optional.ToNullable(consistencyLevel));
diff --git a/src/AzureDataFactory.TestingFramework/Generated/Models/CassandraSource.cs b/src/AzureDataFactory.TestingFramework/Generated/Models/CassandraSource.cs
index 6b2c5a82..7cfa0529 100644
--- a/src/AzureDataFactory.TestingFramework/Generated/Models/CassandraSource.cs
+++ b/src/AzureDataFactory.TestingFramework/Generated/Models/CassandraSource.cs
@@ -29,7 +29,7 @@ public CassandraSource()
         /// <param name="additionalColumns"> Specifies the additional columns to be added to source data. Type: array of objects(AdditionalColumns) (or Expression with resultType array of objects). </param>
         /// <param name="query"> Database query. Should be a SQL-92 query expression or Cassandra Query Language (CQL) command. Type: string (or Expression with resultType string). </param>
         /// <param name="consistencyLevel"> The consistency level specifies how many Cassandra servers must respond to a read request before returning data to the client application. Cassandra checks the specified number of Cassandra servers for data to satisfy the read request. Must be one of cassandraSourceReadConsistencyLevels. The default value is 'ONE'. It is case-insensitive. </param>
-        internal CassandraSource(string copySourceType, DataFactoryElement<int> sourceRetryCount, DataFactoryElement<string> sourceRetryWait, DataFactoryElement<int> maxConcurrentConnections, DataFactoryElement<bool> disableMetricsCollection, IDictionary<string, BinaryData> additionalProperties, DataFactoryElement<string> queryTimeout, BinaryData additionalColumns, DataFactoryElement<string> query, CassandraSourceReadConsistencyLevel? consistencyLevel) : base(copySourceType, sourceRetryCount, sourceRetryWait, maxConcurrentConnections, disableMetricsCollection, additionalProperties, queryTimeout, additionalColumns)
+        internal CassandraSource(string copySourceType, DataFactoryElement<int> sourceRetryCount, DataFactoryElement<string> sourceRetryWait, DataFactoryElement<int> maxConcurrentConnections, DataFactoryElement<bool> disableMetricsCollection, IDictionary<string, DataFactoryElement<string>> additionalProperties, DataFactoryElement<string> queryTimeout, BinaryData additionalColumns, DataFactoryElement<string> query, CassandraSourceReadConsistencyLevel? consistencyLevel) : base(copySourceType, sourceRetryCount, sourceRetryWait, maxConcurrentConnections, disableMetricsCollection, additionalProperties, queryTimeout, additionalColumns)
         {
             Query = query;
             ConsistencyLevel = consistencyLevel;
diff --git a/src/AzureDataFactory.TestingFramework/Generated/Models/CassandraTableDataset.Serialization.cs b/src/AzureDataFactory.TestingFramework/Generated/Models/CassandraTableDataset.Serialization.cs
index 7c38d103..b2be5a90 100644
--- a/src/AzureDataFactory.TestingFramework/Generated/Models/CassandraTableDataset.Serialization.cs
+++ b/src/AzureDataFactory.TestingFramework/Generated/Models/CassandraTableDataset.Serialization.cs
@@ -110,8 +110,8 @@ internal static CassandraTableDataset DeserializeCassandraTableDataset(JsonEleme
             Optional<DatasetFolder> folder = default;
             Optional<DataFactoryElement<string>> tableName = default;
             Optional<DataFactoryElement<string>> keyspace = default;
-            IDictionary<string, BinaryData> additionalProperties = default;
-            Dictionary<string, BinaryData> additionalPropertiesDictionary = new Dictionary<string, BinaryData>();
+            IDictionary<string, DataFactoryElement<string>> additionalProperties = default;
+            Dictionary<string, DataFactoryElement<string>> additionalPropertiesDictionary = new Dictionary<string, DataFactoryElement<string>>();
             foreach (var property in element.EnumerateObject())
             {
                 if (property.NameEquals("type"u8))
@@ -221,7 +221,7 @@ internal static CassandraTableDataset DeserializeCassandraTableDataset(JsonEleme
                     }
                     continue;
                 }
-                additionalPropertiesDictionary.Add(property.Name, BinaryData.FromString(property.Value.GetRawText()));
+                additionalPropertiesDictionary.Add(property.Name, JsonSerializer.Deserialize<DataFactoryElement<string>>(property.Value.GetRawText()));
             }
             additionalProperties = additionalPropertiesDictionary;
             return new CassandraTableDataset(type, description.Value, structure.Value, schema.Value, linkedServiceName, Optional.ToDictionary(parameters), Optional.ToList(annotations), folder.Value, additionalProperties, tableName.Value, keyspace.Value);
diff --git a/src/AzureDataFactory.TestingFramework/Generated/Models/CassandraTableDataset.cs b/src/AzureDataFactory.TestingFramework/Generated/Models/CassandraTableDataset.cs
index 61b61f09..8f233ffb 100644
--- a/src/AzureDataFactory.TestingFramework/Generated/Models/CassandraTableDataset.cs
+++ b/src/AzureDataFactory.TestingFramework/Generated/Models/CassandraTableDataset.cs
@@ -35,7 +35,7 @@ public CassandraTableDataset(DataFactoryLinkedServiceReference linkedServiceName
         /// <param name="additionalProperties"> Additional Properties. </param>
         /// <param name="tableName"> The table name of the Cassandra database. Type: string (or Expression with resultType string). </param>
         /// <param name="keyspace"> The keyspace of the Cassandra database. Type: string (or Expression with resultType string). </param>
-        internal CassandraTableDataset(string datasetType, string description, DataFactoryElement<IList<DatasetDataElement>> structure, DataFactoryElement<IList<DatasetSchemaDataElement>> schema, DataFactoryLinkedServiceReference linkedServiceName, IDictionary<string, EntityParameterSpecification> parameters, IList<BinaryData> annotations, DatasetFolder folder, IDictionary<string, BinaryData> additionalProperties, DataFactoryElement<string> tableName, DataFactoryElement<string> keyspace) : base(datasetType, description, structure, schema, linkedServiceName, parameters, annotations, folder, additionalProperties)
+        internal CassandraTableDataset(string datasetType, string description, DataFactoryElement<IList<DatasetDataElement>> structure, DataFactoryElement<IList<DatasetSchemaDataElement>> schema, DataFactoryLinkedServiceReference linkedServiceName, IDictionary<string, EntityParameterSpecification> parameters, IList<BinaryData> annotations, DatasetFolder folder, IDictionary<string, DataFactoryElement<string>> additionalProperties, DataFactoryElement<string> tableName, DataFactoryElement<string> keyspace) : base(datasetType, description, structure, schema, linkedServiceName, parameters, annotations, folder, additionalProperties)
         {
             TableName = tableName;
             Keyspace = keyspace;
diff --git a/src/AzureDataFactory.TestingFramework/Generated/Models/ChainingTrigger.Serialization.cs b/src/AzureDataFactory.TestingFramework/Generated/Models/ChainingTrigger.Serialization.cs
index 5e715c7d..1a0a1155 100644
--- a/src/AzureDataFactory.TestingFramework/Generated/Models/ChainingTrigger.Serialization.cs
+++ b/src/AzureDataFactory.TestingFramework/Generated/Models/ChainingTrigger.Serialization.cs
@@ -7,6 +7,7 @@
 
 using System.Text.Json;
 using Azure.Core;
+using Azure.Core.Expressions.DataFactory;
 
 namespace AzureDataFactory.TestingFramework.Models
 {
@@ -80,8 +81,8 @@ internal static ChainingTrigger DeserializeChainingTrigger(JsonElement element)
             Optional<IList<BinaryData>> annotations = default;
             IList<DataFactoryPipelineReference> dependsOn = default;
             string runDimension = default;
-            IDictionary<string, BinaryData> additionalProperties = default;
-            Dictionary<string, BinaryData> additionalPropertiesDictionary = new Dictionary<string, BinaryData>();
+            IDictionary<string, DataFactoryElement<string>> additionalProperties = default;
+            Dictionary<string, DataFactoryElement<string>> additionalPropertiesDictionary = new Dictionary<string, DataFactoryElement<string>>();
             foreach (var property in element.EnumerateObject())
             {
                 if (property.NameEquals("pipeline"u8))
@@ -156,7 +157,7 @@ internal static ChainingTrigger DeserializeChainingTrigger(JsonElement element)
                     }
                     continue;
                 }
-                additionalPropertiesDictionary.Add(property.Name, BinaryData.FromString(property.Value.GetRawText()));
+                additionalPropertiesDictionary.Add(property.Name, JsonSerializer.Deserialize<DataFactoryElement<string>>(property.Value.GetRawText()));
             }
             additionalProperties = additionalPropertiesDictionary;
             return new ChainingTrigger(type, description.Value, Optional.ToNullable(runtimeState), Optional.ToList(annotations), additionalProperties, pipeline, dependsOn, runDimension);
diff --git a/src/AzureDataFactory.TestingFramework/Generated/Models/ChainingTrigger.cs b/src/AzureDataFactory.TestingFramework/Generated/Models/ChainingTrigger.cs
index 6234564c..6147efbf 100644
--- a/src/AzureDataFactory.TestingFramework/Generated/Models/ChainingTrigger.cs
+++ b/src/AzureDataFactory.TestingFramework/Generated/Models/ChainingTrigger.cs
@@ -6,6 +6,7 @@
 #nullable disable
 
 using Azure.Core;
+using Azure.Core.Expressions.DataFactory;
 
 namespace AzureDataFactory.TestingFramework.Models
 {
@@ -38,7 +39,7 @@ public ChainingTrigger(TriggerPipelineReference pipeline, IEnumerable<DataFactor
         /// <param name="pipeline"> Pipeline for which runs are created when all upstream pipelines complete successfully. </param>
         /// <param name="dependsOn"> Upstream Pipelines. </param>
         /// <param name="runDimension"> Run Dimension property that needs to be emitted by upstream pipelines. </param>
-        internal ChainingTrigger(string triggerType, string description, DataFactoryTriggerRuntimeState? runtimeState, IList<BinaryData> annotations, IDictionary<string, BinaryData> additionalProperties, TriggerPipelineReference pipeline, IList<DataFactoryPipelineReference> dependsOn, string runDimension) : base(triggerType, description, runtimeState, annotations, additionalProperties)
+        internal ChainingTrigger(string triggerType, string description, DataFactoryTriggerRuntimeState? runtimeState, IList<BinaryData> annotations, IDictionary<string, DataFactoryElement<string>> additionalProperties, TriggerPipelineReference pipeline, IList<DataFactoryPipelineReference> dependsOn, string runDimension) : base(triggerType, description, runtimeState, annotations, additionalProperties)
         {
             Pipeline = pipeline;
             DependsOn = dependsOn;
diff --git a/src/AzureDataFactory.TestingFramework/Generated/Models/CommonDataServiceForAppsEntityDataset.Serialization.cs b/src/AzureDataFactory.TestingFramework/Generated/Models/CommonDataServiceForAppsEntityDataset.Serialization.cs
index d645a4d2..e64fcb3e 100644
--- a/src/AzureDataFactory.TestingFramework/Generated/Models/CommonDataServiceForAppsEntityDataset.Serialization.cs
+++ b/src/AzureDataFactory.TestingFramework/Generated/Models/CommonDataServiceForAppsEntityDataset.Serialization.cs
@@ -104,8 +104,8 @@ internal static CommonDataServiceForAppsEntityDataset DeserializeCommonDataServi
             Optional<IList<BinaryData>> annotations = default;
             Optional<DatasetFolder> folder = default;
             Optional<DataFactoryElement<string>> entityName = default;
-            IDictionary<string, BinaryData> additionalProperties = default;
-            Dictionary<string, BinaryData> additionalPropertiesDictionary = new Dictionary<string, BinaryData>();
+            IDictionary<string, DataFactoryElement<string>> additionalProperties = default;
+            Dictionary<string, DataFactoryElement<string>> additionalPropertiesDictionary = new Dictionary<string, DataFactoryElement<string>>();
             foreach (var property in element.EnumerateObject())
             {
                 if (property.NameEquals("type"u8))
@@ -206,7 +206,7 @@ internal static CommonDataServiceForAppsEntityDataset DeserializeCommonDataServi
                     }
                     continue;
                 }
-                additionalPropertiesDictionary.Add(property.Name, BinaryData.FromString(property.Value.GetRawText()));
+                additionalPropertiesDictionary.Add(property.Name, JsonSerializer.Deserialize<DataFactoryElement<string>>(property.Value.GetRawText()));
             }
             additionalProperties = additionalPropertiesDictionary;
             return new CommonDataServiceForAppsEntityDataset(type, description.Value, structure.Value, schema.Value, linkedServiceName, Optional.ToDictionary(parameters), Optional.ToList(annotations), folder.Value, additionalProperties, entityName.Value);
diff --git a/src/AzureDataFactory.TestingFramework/Generated/Models/CommonDataServiceForAppsEntityDataset.cs b/src/AzureDataFactory.TestingFramework/Generated/Models/CommonDataServiceForAppsEntityDataset.cs
index 7b56bc67..fe84e6cd 100644
--- a/src/AzureDataFactory.TestingFramework/Generated/Models/CommonDataServiceForAppsEntityDataset.cs
+++ b/src/AzureDataFactory.TestingFramework/Generated/Models/CommonDataServiceForAppsEntityDataset.cs
@@ -34,7 +34,7 @@ public CommonDataServiceForAppsEntityDataset(DataFactoryLinkedServiceReference l
         /// <param name="folder"> The folder that this Dataset is in. If not specified, Dataset will appear at the root level. </param>
         /// <param name="additionalProperties"> Additional Properties. </param>
         /// <param name="entityName"> The logical name of the entity. Type: string (or Expression with resultType string). </param>
-        internal CommonDataServiceForAppsEntityDataset(string datasetType, string description, DataFactoryElement<IList<DatasetDataElement>> structure, DataFactoryElement<IList<DatasetSchemaDataElement>> schema, DataFactoryLinkedServiceReference linkedServiceName, IDictionary<string, EntityParameterSpecification> parameters, IList<BinaryData> annotations, DatasetFolder folder, IDictionary<string, BinaryData> additionalProperties, DataFactoryElement<string> entityName) : base(datasetType, description, structure, schema, linkedServiceName, parameters, annotations, folder, additionalProperties)
+        internal CommonDataServiceForAppsEntityDataset(string datasetType, string description, DataFactoryElement<IList<DatasetDataElement>> structure, DataFactoryElement<IList<DatasetSchemaDataElement>> schema, DataFactoryLinkedServiceReference linkedServiceName, IDictionary<string, EntityParameterSpecification> parameters, IList<BinaryData> annotations, DatasetFolder folder, IDictionary<string, DataFactoryElement<string>> additionalProperties, DataFactoryElement<string> entityName) : base(datasetType, description, structure, schema, linkedServiceName, parameters, annotations, folder, additionalProperties)
         {
             EntityName = entityName;
             DatasetType = datasetType ?? "CommonDataServiceForAppsEntity";
diff --git a/src/AzureDataFactory.TestingFramework/Generated/Models/CommonDataServiceForAppsLinkedService.Serialization.cs b/src/AzureDataFactory.TestingFramework/Generated/Models/CommonDataServiceForAppsLinkedService.Serialization.cs
index 5fa0542b..7e27d7ad 100644
--- a/src/AzureDataFactory.TestingFramework/Generated/Models/CommonDataServiceForAppsLinkedService.Serialization.cs
+++ b/src/AzureDataFactory.TestingFramework/Generated/Models/CommonDataServiceForAppsLinkedService.Serialization.cs
@@ -150,8 +150,8 @@ internal static CommonDataServiceForAppsLinkedService DeserializeCommonDataServi
             Optional<DataFactoryElement<string>> servicePrincipalCredentialType = default;
             Optional<DataFactorySecretBaseDefinition> servicePrincipalCredential = default;
             Optional<string> encryptedCredential = default;
-            IDictionary<string, BinaryData> additionalProperties = default;
-            Dictionary<string, BinaryData> additionalPropertiesDictionary = new Dictionary<string, BinaryData>();
+            IDictionary<string, DataFactoryElement<string>> additionalProperties = default;
+            Dictionary<string, DataFactoryElement<string>> additionalPropertiesDictionary = new Dictionary<string, DataFactoryElement<string>>();
             foreach (var property in element.EnumerateObject())
             {
                 if (property.NameEquals("type"u8))
@@ -316,7 +316,7 @@ internal static CommonDataServiceForAppsLinkedService DeserializeCommonDataServi
                     }
                     continue;
                 }
-                additionalPropertiesDictionary.Add(property.Name, BinaryData.FromString(property.Value.GetRawText()));
+                additionalPropertiesDictionary.Add(property.Name, JsonSerializer.Deserialize<DataFactoryElement<string>>(property.Value.GetRawText()));
             }
             additionalProperties = additionalPropertiesDictionary;
             return new CommonDataServiceForAppsLinkedService(type, connectVia.Value, description.Value, Optional.ToDictionary(parameters), Optional.ToList(annotations), additionalProperties, deploymentType, hostName.Value, port.Value, serviceUri.Value, organizationName.Value, authenticationType, username.Value, password, servicePrincipalId.Value, servicePrincipalCredentialType.Value, servicePrincipalCredential, encryptedCredential.Value);
diff --git a/src/AzureDataFactory.TestingFramework/Generated/Models/CommonDataServiceForAppsLinkedService.cs b/src/AzureDataFactory.TestingFramework/Generated/Models/CommonDataServiceForAppsLinkedService.cs
index 792c1498..100c5a82 100644
--- a/src/AzureDataFactory.TestingFramework/Generated/Models/CommonDataServiceForAppsLinkedService.cs
+++ b/src/AzureDataFactory.TestingFramework/Generated/Models/CommonDataServiceForAppsLinkedService.cs
@@ -46,7 +46,7 @@ public CommonDataServiceForAppsLinkedService(DataFactoryElement<string> deployme
         /// <param name="servicePrincipalCredentialType"> The service principal credential type to use in Server-To-Server authentication. 'ServicePrincipalKey' for key/secret, 'ServicePrincipalCert' for certificate. Type: string (or Expression with resultType string). </param>
         /// <param name="servicePrincipalCredential"> The credential of the service principal object in Azure Active Directory. If servicePrincipalCredentialType is 'ServicePrincipalKey', servicePrincipalCredential can be SecureString or AzureKeyVaultSecretReference. If servicePrincipalCredentialType is 'ServicePrincipalCert', servicePrincipalCredential can only be AzureKeyVaultSecretReference. </param>
         /// <param name="encryptedCredential"> The encrypted credential used for authentication. Credentials are encrypted using the integration runtime credential manager. Type: string. </param>
-        internal CommonDataServiceForAppsLinkedService(string linkedServiceType, IntegrationRuntimeReference connectVia, string description, IDictionary<string, EntityParameterSpecification> parameters, IList<BinaryData> annotations, IDictionary<string, BinaryData> additionalProperties, DataFactoryElement<string> deploymentType, DataFactoryElement<string> hostName, DataFactoryElement<int> port, DataFactoryElement<string> serviceUri, DataFactoryElement<string> organizationName, DataFactoryElement<string> authenticationType, DataFactoryElement<string> username, DataFactorySecretBaseDefinition password, DataFactoryElement<string> servicePrincipalId, DataFactoryElement<string> servicePrincipalCredentialType, DataFactorySecretBaseDefinition servicePrincipalCredential, string encryptedCredential) : base(linkedServiceType, connectVia, description, parameters, annotations, additionalProperties)
+        internal CommonDataServiceForAppsLinkedService(string linkedServiceType, IntegrationRuntimeReference connectVia, string description, IDictionary<string, EntityParameterSpecification> parameters, IList<BinaryData> annotations, IDictionary<string, DataFactoryElement<string>> additionalProperties, DataFactoryElement<string> deploymentType, DataFactoryElement<string> hostName, DataFactoryElement<int> port, DataFactoryElement<string> serviceUri, DataFactoryElement<string> organizationName, DataFactoryElement<string> authenticationType, DataFactoryElement<string> username, DataFactorySecretBaseDefinition password, DataFactoryElement<string> servicePrincipalId, DataFactoryElement<string> servicePrincipalCredentialType, DataFactorySecretBaseDefinition servicePrincipalCredential, string encryptedCredential) : base(linkedServiceType, connectVia, description, parameters, annotations, additionalProperties)
         {
             DeploymentType = deploymentType;
             HostName = hostName;
diff --git a/src/AzureDataFactory.TestingFramework/Generated/Models/CommonDataServiceForAppsSink.Serialization.cs b/src/AzureDataFactory.TestingFramework/Generated/Models/CommonDataServiceForAppsSink.Serialization.cs
index 6b77eca3..f070a3d0 100644
--- a/src/AzureDataFactory.TestingFramework/Generated/Models/CommonDataServiceForAppsSink.Serialization.cs
+++ b/src/AzureDataFactory.TestingFramework/Generated/Models/CommonDataServiceForAppsSink.Serialization.cs
@@ -88,8 +88,8 @@ internal static CommonDataServiceForAppsSink DeserializeCommonDataServiceForApps
             Optional<DataFactoryElement<string>> sinkRetryWait = default;
             Optional<DataFactoryElement<int>> maxConcurrentConnections = default;
             Optional<DataFactoryElement<bool>> disableMetricsCollection = default;
-            IDictionary<string, BinaryData> additionalProperties = default;
-            Dictionary<string, BinaryData> additionalPropertiesDictionary = new Dictionary<string, BinaryData>();
+            IDictionary<string, DataFactoryElement<string>> additionalProperties = default;
+            Dictionary<string, DataFactoryElement<string>> additionalPropertiesDictionary = new Dictionary<string, DataFactoryElement<string>>();
             foreach (var property in element.EnumerateObject())
             {
                 if (property.NameEquals("writeBehavior"u8))
@@ -174,7 +174,7 @@ internal static CommonDataServiceForAppsSink DeserializeCommonDataServiceForApps
                     disableMetricsCollection = JsonSerializer.Deserialize<DataFactoryElement<bool>>(property.Value.GetRawText());
                     continue;
                 }
-                additionalPropertiesDictionary.Add(property.Name, BinaryData.FromString(property.Value.GetRawText()));
+                additionalPropertiesDictionary.Add(property.Name, JsonSerializer.Deserialize<DataFactoryElement<string>>(property.Value.GetRawText()));
             }
             additionalProperties = additionalPropertiesDictionary;
             return new CommonDataServiceForAppsSink(type, writeBatchSize.Value, writeBatchTimeout.Value, sinkRetryCount.Value, sinkRetryWait.Value, maxConcurrentConnections.Value, disableMetricsCollection.Value, additionalProperties, writeBehavior, ignoreNullValues.Value, alternateKeyName.Value);
diff --git a/src/AzureDataFactory.TestingFramework/Generated/Models/CommonDataServiceForAppsSink.cs b/src/AzureDataFactory.TestingFramework/Generated/Models/CommonDataServiceForAppsSink.cs
index bb49a953..8bf76565 100644
--- a/src/AzureDataFactory.TestingFramework/Generated/Models/CommonDataServiceForAppsSink.cs
+++ b/src/AzureDataFactory.TestingFramework/Generated/Models/CommonDataServiceForAppsSink.cs
@@ -32,7 +32,7 @@ public CommonDataServiceForAppsSink(DynamicsSinkWriteBehavior writeBehavior)
         /// <param name="writeBehavior"> The write behavior for the operation. </param>
         /// <param name="ignoreNullValues"> The flag indicating whether to ignore null values from input dataset (except key fields) during write operation. Default is false. Type: boolean (or Expression with resultType boolean). </param>
         /// <param name="alternateKeyName"> The logical name of the alternate key which will be used when upserting records. Type: string (or Expression with resultType string). </param>
-        internal CommonDataServiceForAppsSink(string copySinkType, DataFactoryElement<int> writeBatchSize, DataFactoryElement<string> writeBatchTimeout, DataFactoryElement<int> sinkRetryCount, DataFactoryElement<string> sinkRetryWait, DataFactoryElement<int> maxConcurrentConnections, DataFactoryElement<bool> disableMetricsCollection, IDictionary<string, BinaryData> additionalProperties, DynamicsSinkWriteBehavior writeBehavior, DataFactoryElement<bool> ignoreNullValues, DataFactoryElement<string> alternateKeyName) : base(copySinkType, writeBatchSize, writeBatchTimeout, sinkRetryCount, sinkRetryWait, maxConcurrentConnections, disableMetricsCollection, additionalProperties)
+        internal CommonDataServiceForAppsSink(string copySinkType, DataFactoryElement<int> writeBatchSize, DataFactoryElement<string> writeBatchTimeout, DataFactoryElement<int> sinkRetryCount, DataFactoryElement<string> sinkRetryWait, DataFactoryElement<int> maxConcurrentConnections, DataFactoryElement<bool> disableMetricsCollection, IDictionary<string, DataFactoryElement<string>> additionalProperties, DynamicsSinkWriteBehavior writeBehavior, DataFactoryElement<bool> ignoreNullValues, DataFactoryElement<string> alternateKeyName) : base(copySinkType, writeBatchSize, writeBatchTimeout, sinkRetryCount, sinkRetryWait, maxConcurrentConnections, disableMetricsCollection, additionalProperties)
         {
             WriteBehavior = writeBehavior;
             IgnoreNullValues = ignoreNullValues;
diff --git a/src/AzureDataFactory.TestingFramework/Generated/Models/CommonDataServiceForAppsSource.Serialization.cs b/src/AzureDataFactory.TestingFramework/Generated/Models/CommonDataServiceForAppsSource.Serialization.cs
index f948e660..76505f3f 100644
--- a/src/AzureDataFactory.TestingFramework/Generated/Models/CommonDataServiceForAppsSource.Serialization.cs
+++ b/src/AzureDataFactory.TestingFramework/Generated/Models/CommonDataServiceForAppsSource.Serialization.cs
@@ -77,8 +77,8 @@ internal static CommonDataServiceForAppsSource DeserializeCommonDataServiceForAp
             Optional<DataFactoryElement<string>> sourceRetryWait = default;
             Optional<DataFactoryElement<int>> maxConcurrentConnections = default;
             Optional<DataFactoryElement<bool>> disableMetricsCollection = default;
-            IDictionary<string, BinaryData> additionalProperties = default;
-            Dictionary<string, BinaryData> additionalPropertiesDictionary = new Dictionary<string, BinaryData>();
+            IDictionary<string, DataFactoryElement<string>> additionalProperties = default;
+            Dictionary<string, DataFactoryElement<string>> additionalPropertiesDictionary = new Dictionary<string, DataFactoryElement<string>>();
             foreach (var property in element.EnumerateObject())
             {
                 if (property.NameEquals("query"u8))
@@ -140,7 +140,7 @@ internal static CommonDataServiceForAppsSource DeserializeCommonDataServiceForAp
                     disableMetricsCollection = JsonSerializer.Deserialize<DataFactoryElement<bool>>(property.Value.GetRawText());
                     continue;
                 }
-                additionalPropertiesDictionary.Add(property.Name, BinaryData.FromString(property.Value.GetRawText()));
+                additionalPropertiesDictionary.Add(property.Name, JsonSerializer.Deserialize<DataFactoryElement<string>>(property.Value.GetRawText()));
             }
             additionalProperties = additionalPropertiesDictionary;
             return new CommonDataServiceForAppsSource(type, sourceRetryCount.Value, sourceRetryWait.Value, maxConcurrentConnections.Value, disableMetricsCollection.Value, additionalProperties, query.Value, additionalColumns.Value);
diff --git a/src/AzureDataFactory.TestingFramework/Generated/Models/CommonDataServiceForAppsSource.cs b/src/AzureDataFactory.TestingFramework/Generated/Models/CommonDataServiceForAppsSource.cs
index 86fef1ac..05c367ca 100644
--- a/src/AzureDataFactory.TestingFramework/Generated/Models/CommonDataServiceForAppsSource.cs
+++ b/src/AzureDataFactory.TestingFramework/Generated/Models/CommonDataServiceForAppsSource.cs
@@ -27,7 +27,7 @@ public CommonDataServiceForAppsSource()
         /// <param name="additionalProperties"> Additional Properties. </param>
         /// <param name="query"> FetchXML is a proprietary query language that is used in Microsoft Common Data Service for Apps (online &amp; on-premises). Type: string (or Expression with resultType string). </param>
         /// <param name="additionalColumns"> Specifies the additional columns to be added to source data. Type: array of objects(AdditionalColumns) (or Expression with resultType array of objects). </param>
-        internal CommonDataServiceForAppsSource(string copySourceType, DataFactoryElement<int> sourceRetryCount, DataFactoryElement<string> sourceRetryWait, DataFactoryElement<int> maxConcurrentConnections, DataFactoryElement<bool> disableMetricsCollection, IDictionary<string, BinaryData> additionalProperties, DataFactoryElement<string> query, BinaryData additionalColumns) : base(copySourceType, sourceRetryCount, sourceRetryWait, maxConcurrentConnections, disableMetricsCollection, additionalProperties)
+        internal CommonDataServiceForAppsSource(string copySourceType, DataFactoryElement<int> sourceRetryCount, DataFactoryElement<string> sourceRetryWait, DataFactoryElement<int> maxConcurrentConnections, DataFactoryElement<bool> disableMetricsCollection, IDictionary<string, DataFactoryElement<string>> additionalProperties, DataFactoryElement<string> query, BinaryData additionalColumns) : base(copySourceType, sourceRetryCount, sourceRetryWait, maxConcurrentConnections, disableMetricsCollection, additionalProperties)
         {
             Query = query;
             AdditionalColumns = additionalColumns;
diff --git a/src/AzureDataFactory.TestingFramework/Generated/Models/CompressionReadSettings.cs b/src/AzureDataFactory.TestingFramework/Generated/Models/CompressionReadSettings.cs
index afc0e961..7fc9613d 100644
--- a/src/AzureDataFactory.TestingFramework/Generated/Models/CompressionReadSettings.cs
+++ b/src/AzureDataFactory.TestingFramework/Generated/Models/CompressionReadSettings.cs
@@ -6,6 +6,7 @@
 #nullable disable
 
 using Azure.Core;
+using Azure.Core.Expressions.DataFactory;
 
 namespace AzureDataFactory.TestingFramework.Models
 {
@@ -19,13 +20,13 @@ public partial class CompressionReadSettings
         /// <summary> Initializes a new instance of CompressionReadSettings. </summary>
         public CompressionReadSettings()
         {
-            AdditionalProperties = new ChangeTrackingDictionary<string, BinaryData>();
+            AdditionalProperties = new ChangeTrackingDictionary<string, DataFactoryElement<string>>();
         }
 
         /// <summary> Initializes a new instance of CompressionReadSettings. </summary>
         /// <param name="compressionReadSettingsType"> The Compression setting type. </param>
         /// <param name="additionalProperties"> Additional Properties. </param>
-        internal CompressionReadSettings(string compressionReadSettingsType, IDictionary<string, BinaryData> additionalProperties)
+        internal CompressionReadSettings(string compressionReadSettingsType, IDictionary<string, DataFactoryElement<string>> additionalProperties)
         {
             CompressionReadSettingsType = compressionReadSettingsType;
             AdditionalProperties = additionalProperties;
@@ -63,6 +64,6 @@ internal CompressionReadSettings(string compressionReadSettingsType, IDictionary
         /// </list>
         /// </para>
         /// </summary>
-        public IDictionary<string, BinaryData> AdditionalProperties { get; }
+        public IDictionary<string, DataFactoryElement<string>> AdditionalProperties { get; }
     }
 }
diff --git a/src/AzureDataFactory.TestingFramework/Generated/Models/ConcurLinkedService.Serialization.cs b/src/AzureDataFactory.TestingFramework/Generated/Models/ConcurLinkedService.Serialization.cs
index f27f83da..d8219c13 100644
--- a/src/AzureDataFactory.TestingFramework/Generated/Models/ConcurLinkedService.Serialization.cs
+++ b/src/AzureDataFactory.TestingFramework/Generated/Models/ConcurLinkedService.Serialization.cs
@@ -130,8 +130,8 @@ internal static ConcurLinkedService DeserializeConcurLinkedService(JsonElement e
             Optional<DataFactoryElement<bool>> useHostVerification = default;
             Optional<DataFactoryElement<bool>> usePeerVerification = default;
             Optional<string> encryptedCredential = default;
-            IDictionary<string, BinaryData> additionalProperties = default;
-            Dictionary<string, BinaryData> additionalPropertiesDictionary = new Dictionary<string, BinaryData>();
+            IDictionary<string, DataFactoryElement<string>> additionalProperties = default;
+            Dictionary<string, DataFactoryElement<string>> additionalPropertiesDictionary = new Dictionary<string, DataFactoryElement<string>>();
             foreach (var property in element.EnumerateObject())
             {
                 if (property.NameEquals("type"u8))
@@ -260,7 +260,7 @@ internal static ConcurLinkedService DeserializeConcurLinkedService(JsonElement e
                     }
                     continue;
                 }
-                additionalPropertiesDictionary.Add(property.Name, BinaryData.FromString(property.Value.GetRawText()));
+                additionalPropertiesDictionary.Add(property.Name, JsonSerializer.Deserialize<DataFactoryElement<string>>(property.Value.GetRawText()));
             }
             additionalProperties = additionalPropertiesDictionary;
             return new ConcurLinkedService(type, connectVia.Value, description.Value, Optional.ToDictionary(parameters), Optional.ToList(annotations), additionalProperties, connectionProperties.Value, clientId, username, password, useEncryptedEndpoints.Value, useHostVerification.Value, usePeerVerification.Value, encryptedCredential.Value);
diff --git a/src/AzureDataFactory.TestingFramework/Generated/Models/ConcurLinkedService.cs b/src/AzureDataFactory.TestingFramework/Generated/Models/ConcurLinkedService.cs
index 7b087dbf..724468f1 100644
--- a/src/AzureDataFactory.TestingFramework/Generated/Models/ConcurLinkedService.cs
+++ b/src/AzureDataFactory.TestingFramework/Generated/Models/ConcurLinkedService.cs
@@ -42,7 +42,7 @@ public ConcurLinkedService(DataFactoryElement<string> clientId, DataFactoryEleme
         /// <param name="useHostVerification"> Specifies whether to require the host name in the server's certificate to match the host name of the server when connecting over SSL. The default value is true. </param>
         /// <param name="usePeerVerification"> Specifies whether to verify the identity of the server when connecting over SSL. The default value is true. </param>
         /// <param name="encryptedCredential"> The encrypted credential used for authentication. Credentials are encrypted using the integration runtime credential manager. Type: string. </param>
-        internal ConcurLinkedService(string linkedServiceType, IntegrationRuntimeReference connectVia, string description, IDictionary<string, EntityParameterSpecification> parameters, IList<BinaryData> annotations, IDictionary<string, BinaryData> additionalProperties, BinaryData connectionProperties, DataFactoryElement<string> clientId, DataFactoryElement<string> username, DataFactorySecretBaseDefinition password, DataFactoryElement<bool> useEncryptedEndpoints, DataFactoryElement<bool> useHostVerification, DataFactoryElement<bool> usePeerVerification, string encryptedCredential) : base(linkedServiceType, connectVia, description, parameters, annotations, additionalProperties)
+        internal ConcurLinkedService(string linkedServiceType, IntegrationRuntimeReference connectVia, string description, IDictionary<string, EntityParameterSpecification> parameters, IList<BinaryData> annotations, IDictionary<string, DataFactoryElement<string>> additionalProperties, BinaryData connectionProperties, DataFactoryElement<string> clientId, DataFactoryElement<string> username, DataFactorySecretBaseDefinition password, DataFactoryElement<bool> useEncryptedEndpoints, DataFactoryElement<bool> useHostVerification, DataFactoryElement<bool> usePeerVerification, string encryptedCredential) : base(linkedServiceType, connectVia, description, parameters, annotations, additionalProperties)
         {
             ConnectionProperties = connectionProperties;
             ClientId = clientId;
diff --git a/src/AzureDataFactory.TestingFramework/Generated/Models/ConcurObjectDataset.Serialization.cs b/src/AzureDataFactory.TestingFramework/Generated/Models/ConcurObjectDataset.Serialization.cs
index 3da90fbd..a5f093da 100644
--- a/src/AzureDataFactory.TestingFramework/Generated/Models/ConcurObjectDataset.Serialization.cs
+++ b/src/AzureDataFactory.TestingFramework/Generated/Models/ConcurObjectDataset.Serialization.cs
@@ -104,8 +104,8 @@ internal static ConcurObjectDataset DeserializeConcurObjectDataset(JsonElement e
             Optional<IList<BinaryData>> annotations = default;
             Optional<DatasetFolder> folder = default;
             Optional<DataFactoryElement<string>> tableName = default;
-            IDictionary<string, BinaryData> additionalProperties = default;
-            Dictionary<string, BinaryData> additionalPropertiesDictionary = new Dictionary<string, BinaryData>();
+            IDictionary<string, DataFactoryElement<string>> additionalProperties = default;
+            Dictionary<string, DataFactoryElement<string>> additionalPropertiesDictionary = new Dictionary<string, DataFactoryElement<string>>();
             foreach (var property in element.EnumerateObject())
             {
                 if (property.NameEquals("type"u8))
@@ -206,7 +206,7 @@ internal static ConcurObjectDataset DeserializeConcurObjectDataset(JsonElement e
                     }
                     continue;
                 }
-                additionalPropertiesDictionary.Add(property.Name, BinaryData.FromString(property.Value.GetRawText()));
+                additionalPropertiesDictionary.Add(property.Name, JsonSerializer.Deserialize<DataFactoryElement<string>>(property.Value.GetRawText()));
             }
             additionalProperties = additionalPropertiesDictionary;
             return new ConcurObjectDataset(type, description.Value, structure.Value, schema.Value, linkedServiceName, Optional.ToDictionary(parameters), Optional.ToList(annotations), folder.Value, additionalProperties, tableName.Value);
diff --git a/src/AzureDataFactory.TestingFramework/Generated/Models/ConcurObjectDataset.cs b/src/AzureDataFactory.TestingFramework/Generated/Models/ConcurObjectDataset.cs
index ddc1b870..4f2bd74b 100644
--- a/src/AzureDataFactory.TestingFramework/Generated/Models/ConcurObjectDataset.cs
+++ b/src/AzureDataFactory.TestingFramework/Generated/Models/ConcurObjectDataset.cs
@@ -34,7 +34,7 @@ public ConcurObjectDataset(DataFactoryLinkedServiceReference linkedServiceName)
         /// <param name="folder"> The folder that this Dataset is in. If not specified, Dataset will appear at the root level. </param>
         /// <param name="additionalProperties"> Additional Properties. </param>
         /// <param name="tableName"> The table name. Type: string (or Expression with resultType string). </param>
-        internal ConcurObjectDataset(string datasetType, string description, DataFactoryElement<IList<DatasetDataElement>> structure, DataFactoryElement<IList<DatasetSchemaDataElement>> schema, DataFactoryLinkedServiceReference linkedServiceName, IDictionary<string, EntityParameterSpecification> parameters, IList<BinaryData> annotations, DatasetFolder folder, IDictionary<string, BinaryData> additionalProperties, DataFactoryElement<string> tableName) : base(datasetType, description, structure, schema, linkedServiceName, parameters, annotations, folder, additionalProperties)
+        internal ConcurObjectDataset(string datasetType, string description, DataFactoryElement<IList<DatasetDataElement>> structure, DataFactoryElement<IList<DatasetSchemaDataElement>> schema, DataFactoryLinkedServiceReference linkedServiceName, IDictionary<string, EntityParameterSpecification> parameters, IList<BinaryData> annotations, DatasetFolder folder, IDictionary<string, DataFactoryElement<string>> additionalProperties, DataFactoryElement<string> tableName) : base(datasetType, description, structure, schema, linkedServiceName, parameters, annotations, folder, additionalProperties)
         {
             TableName = tableName;
             DatasetType = datasetType ?? "ConcurObject";
diff --git a/src/AzureDataFactory.TestingFramework/Generated/Models/ConcurSource.Serialization.cs b/src/AzureDataFactory.TestingFramework/Generated/Models/ConcurSource.Serialization.cs
index 176240a0..682226f7 100644
--- a/src/AzureDataFactory.TestingFramework/Generated/Models/ConcurSource.Serialization.cs
+++ b/src/AzureDataFactory.TestingFramework/Generated/Models/ConcurSource.Serialization.cs
@@ -83,8 +83,8 @@ internal static ConcurSource DeserializeConcurSource(JsonElement element)
             Optional<DataFactoryElement<string>> sourceRetryWait = default;
             Optional<DataFactoryElement<int>> maxConcurrentConnections = default;
             Optional<DataFactoryElement<bool>> disableMetricsCollection = default;
-            IDictionary<string, BinaryData> additionalProperties = default;
-            Dictionary<string, BinaryData> additionalPropertiesDictionary = new Dictionary<string, BinaryData>();
+            IDictionary<string, DataFactoryElement<string>> additionalProperties = default;
+            Dictionary<string, DataFactoryElement<string>> additionalPropertiesDictionary = new Dictionary<string, DataFactoryElement<string>>();
             foreach (var property in element.EnumerateObject())
             {
                 if (property.NameEquals("query"u8))
@@ -155,7 +155,7 @@ internal static ConcurSource DeserializeConcurSource(JsonElement element)
                     disableMetricsCollection = JsonSerializer.Deserialize<DataFactoryElement<bool>>(property.Value.GetRawText());
                     continue;
                 }
-                additionalPropertiesDictionary.Add(property.Name, BinaryData.FromString(property.Value.GetRawText()));
+                additionalPropertiesDictionary.Add(property.Name, JsonSerializer.Deserialize<DataFactoryElement<string>>(property.Value.GetRawText()));
             }
             additionalProperties = additionalPropertiesDictionary;
             return new ConcurSource(type, sourceRetryCount.Value, sourceRetryWait.Value, maxConcurrentConnections.Value, disableMetricsCollection.Value, additionalProperties, queryTimeout.Value, additionalColumns.Value, query.Value);
diff --git a/src/AzureDataFactory.TestingFramework/Generated/Models/ConcurSource.cs b/src/AzureDataFactory.TestingFramework/Generated/Models/ConcurSource.cs
index 0b35b934..1a81918c 100644
--- a/src/AzureDataFactory.TestingFramework/Generated/Models/ConcurSource.cs
+++ b/src/AzureDataFactory.TestingFramework/Generated/Models/ConcurSource.cs
@@ -28,7 +28,7 @@ public ConcurSource()
         /// <param name="queryTimeout"> Query timeout. Type: string (or Expression with resultType string), pattern: ((\d+)\.)?(\d\d):(60|([0-5][0-9])):(60|([0-5][0-9])). </param>
         /// <param name="additionalColumns"> Specifies the additional columns to be added to source data. Type: array of objects(AdditionalColumns) (or Expression with resultType array of objects). </param>
         /// <param name="query"> A query to retrieve data from source. Type: string (or Expression with resultType string). </param>
-        internal ConcurSource(string copySourceType, DataFactoryElement<int> sourceRetryCount, DataFactoryElement<string> sourceRetryWait, DataFactoryElement<int> maxConcurrentConnections, DataFactoryElement<bool> disableMetricsCollection, IDictionary<string, BinaryData> additionalProperties, DataFactoryElement<string> queryTimeout, BinaryData additionalColumns, DataFactoryElement<string> query) : base(copySourceType, sourceRetryCount, sourceRetryWait, maxConcurrentConnections, disableMetricsCollection, additionalProperties, queryTimeout, additionalColumns)
+        internal ConcurSource(string copySourceType, DataFactoryElement<int> sourceRetryCount, DataFactoryElement<string> sourceRetryWait, DataFactoryElement<int> maxConcurrentConnections, DataFactoryElement<bool> disableMetricsCollection, IDictionary<string, DataFactoryElement<string>> additionalProperties, DataFactoryElement<string> queryTimeout, BinaryData additionalColumns, DataFactoryElement<string> query) : base(copySourceType, sourceRetryCount, sourceRetryWait, maxConcurrentConnections, disableMetricsCollection, additionalProperties, queryTimeout, additionalColumns)
         {
             Query = query;
             CopySourceType = copySourceType ?? "ConcurSource";
diff --git a/src/AzureDataFactory.TestingFramework/Generated/Models/ControlActivity.Serialization.cs b/src/AzureDataFactory.TestingFramework/Generated/Models/ControlActivity.Serialization.cs
index 6f3470cb..251df79c 100644
--- a/src/AzureDataFactory.TestingFramework/Generated/Models/ControlActivity.Serialization.cs
+++ b/src/AzureDataFactory.TestingFramework/Generated/Models/ControlActivity.Serialization.cs
@@ -7,6 +7,7 @@
 
 using System.Text.Json;
 using Azure.Core;
+using Azure.Core.Expressions.DataFactory;
 
 namespace AzureDataFactory.TestingFramework.Models
 {
@@ -97,8 +98,8 @@ internal static ControlActivity DeserializeControlActivity(JsonElement element)
             Optional<ActivityOnInactiveMarkAs> onInactiveMarkAs = default;
             Optional<IList<PipelineActivityDependency>> dependsOn = default;
             Optional<IList<PipelineActivityUserProperty>> userProperties = default;
-            IDictionary<string, BinaryData> additionalProperties = default;
-            Dictionary<string, BinaryData> additionalPropertiesDictionary = new Dictionary<string, BinaryData>();
+            IDictionary<string, DataFactoryElement<string>> additionalProperties = default;
+            Dictionary<string, DataFactoryElement<string>> additionalPropertiesDictionary = new Dictionary<string, DataFactoryElement<string>>();
             foreach (var property in element.EnumerateObject())
             {
                 if (property.NameEquals("name"u8))
@@ -162,7 +163,7 @@ internal static ControlActivity DeserializeControlActivity(JsonElement element)
                     userProperties = array;
                     continue;
                 }
-                additionalPropertiesDictionary.Add(property.Name, BinaryData.FromString(property.Value.GetRawText()));
+                additionalPropertiesDictionary.Add(property.Name, JsonSerializer.Deserialize<DataFactoryElement<string>>(property.Value.GetRawText()));
             }
             additionalProperties = additionalPropertiesDictionary;
             return new ControlActivity(name, type, description.Value, Optional.ToNullable(state), Optional.ToNullable(onInactiveMarkAs), Optional.ToList(dependsOn), Optional.ToList(userProperties), additionalProperties);
diff --git a/src/AzureDataFactory.TestingFramework/Generated/Models/ControlActivity.cs b/src/AzureDataFactory.TestingFramework/Generated/Models/ControlActivity.cs
index 087af943..91fdce44 100644
--- a/src/AzureDataFactory.TestingFramework/Generated/Models/ControlActivity.cs
+++ b/src/AzureDataFactory.TestingFramework/Generated/Models/ControlActivity.cs
@@ -6,6 +6,7 @@
 #nullable disable
 
 using Azure.Core;
+using Azure.Core.Expressions.DataFactory;
 
 namespace AzureDataFactory.TestingFramework.Models
 {
@@ -35,7 +36,7 @@ public ControlActivity(string name) : base(name)
         /// <param name="dependsOn"> Activity depends on condition. </param>
         /// <param name="userProperties"> Activity user properties. </param>
         /// <param name="additionalProperties"> Additional Properties. </param>
-        internal ControlActivity(string name, string activityType, string description, PipelineActivityState? state, ActivityOnInactiveMarkAs? onInactiveMarkAs, IList<PipelineActivityDependency> dependsOn, IList<PipelineActivityUserProperty> userProperties, IDictionary<string, BinaryData> additionalProperties) : base(name, activityType, description, state, onInactiveMarkAs, dependsOn, userProperties, additionalProperties)
+        internal ControlActivity(string name, string activityType, string description, PipelineActivityState? state, ActivityOnInactiveMarkAs? onInactiveMarkAs, IList<PipelineActivityDependency> dependsOn, IList<PipelineActivityUserProperty> userProperties, IDictionary<string, DataFactoryElement<string>> additionalProperties) : base(name, activityType, description, state, onInactiveMarkAs, dependsOn, userProperties, additionalProperties)
         {
             ActivityType = activityType ?? "Container";
         }
diff --git a/src/AzureDataFactory.TestingFramework/Generated/Models/CopyActivity.Serialization.cs b/src/AzureDataFactory.TestingFramework/Generated/Models/CopyActivity.Serialization.cs
index 72cebff6..045bd339 100644
--- a/src/AzureDataFactory.TestingFramework/Generated/Models/CopyActivity.Serialization.cs
+++ b/src/AzureDataFactory.TestingFramework/Generated/Models/CopyActivity.Serialization.cs
@@ -233,8 +233,8 @@ internal static CopyActivity DeserializeCopyActivity(JsonElement element)
             Optional<IList<BinaryData>> preserve = default;
             Optional<DataFactoryElement<bool>> validateDataConsistency = default;
             Optional<SkipErrorFile> skipErrorFile = default;
-            IDictionary<string, BinaryData> additionalProperties = default;
-            Dictionary<string, BinaryData> additionalPropertiesDictionary = new Dictionary<string, BinaryData>();
+            IDictionary<string, DataFactoryElement<string>> additionalProperties = default;
+            Dictionary<string, DataFactoryElement<string>> additionalPropertiesDictionary = new Dictionary<string, DataFactoryElement<string>>();
             foreach (var property in element.EnumerateObject())
             {
                 if (property.NameEquals("inputs"u8))
@@ -507,7 +507,7 @@ internal static CopyActivity DeserializeCopyActivity(JsonElement element)
                     }
                     continue;
                 }
-                additionalPropertiesDictionary.Add(property.Name, BinaryData.FromString(property.Value.GetRawText()));
+                additionalPropertiesDictionary.Add(property.Name, JsonSerializer.Deserialize<DataFactoryElement<string>>(property.Value.GetRawText()));
             }
             additionalProperties = additionalPropertiesDictionary;
             return new CopyActivity(name, type, description.Value, Optional.ToNullable(state), Optional.ToNullable(onInactiveMarkAs), Optional.ToList(dependsOn), Optional.ToList(userProperties), additionalProperties, linkedServiceName, policy.Value, Optional.ToList(inputs), Optional.ToList(outputs), source, sink, translator.Value, enableStaging.Value, stagingSettings.Value, parallelCopies.Value, dataIntegrationUnits.Value, enableSkipIncompatibleRow.Value, redirectIncompatibleRowSettings.Value, logStorageSettings.Value, logSettings.Value, Optional.ToList(preserveRules), Optional.ToList(preserve), validateDataConsistency.Value, skipErrorFile.Value);
diff --git a/src/AzureDataFactory.TestingFramework/Generated/Models/CopyActivity.cs b/src/AzureDataFactory.TestingFramework/Generated/Models/CopyActivity.cs
index b9c5c0e8..4f72df6b 100644
--- a/src/AzureDataFactory.TestingFramework/Generated/Models/CopyActivity.cs
+++ b/src/AzureDataFactory.TestingFramework/Generated/Models/CopyActivity.cs
@@ -77,7 +77,7 @@ public CopyActivity(string name, CopyActivitySource source, CopySink sink) : bas
         /// <param name="preserve"> Preserve rules. </param>
         /// <param name="validateDataConsistency"> Whether to enable Data Consistency validation. Type: boolean (or Expression with resultType boolean). </param>
         /// <param name="skipErrorFile"> Specify the fault tolerance for data consistency. </param>
-        internal CopyActivity(string name, string activityType, string description, PipelineActivityState? state, ActivityOnInactiveMarkAs? onInactiveMarkAs, IList<PipelineActivityDependency> dependsOn, IList<PipelineActivityUserProperty> userProperties, IDictionary<string, BinaryData> additionalProperties, DataFactoryLinkedServiceReference linkedServiceName, PipelineActivityPolicy policy, IList<DatasetReference> inputs, IList<DatasetReference> outputs, CopyActivitySource source, CopySink sink, BinaryData translator, DataFactoryElement<bool> enableStaging, StagingSettings stagingSettings, DataFactoryElement<int> parallelCopies, DataFactoryElement<int> dataIntegrationUnits, DataFactoryElement<bool> enableSkipIncompatibleRow, RedirectIncompatibleRowSettings redirectIncompatibleRowSettings, LogStorageSettings logStorageSettings, DataFactoryLogSettings logSettings, IList<BinaryData> preserveRules, IList<BinaryData> preserve, DataFactoryElement<bool> validateDataConsistency, SkipErrorFile skipErrorFile) : base(name, activityType, description, state, onInactiveMarkAs, dependsOn, userProperties, additionalProperties, linkedServiceName, policy)
+        internal CopyActivity(string name, string activityType, string description, PipelineActivityState? state, ActivityOnInactiveMarkAs? onInactiveMarkAs, IList<PipelineActivityDependency> dependsOn, IList<PipelineActivityUserProperty> userProperties, IDictionary<string, DataFactoryElement<string>> additionalProperties, DataFactoryLinkedServiceReference linkedServiceName, PipelineActivityPolicy policy, IList<DatasetReference> inputs, IList<DatasetReference> outputs, CopyActivitySource source, CopySink sink, BinaryData translator, DataFactoryElement<bool> enableStaging, StagingSettings stagingSettings, DataFactoryElement<int> parallelCopies, DataFactoryElement<int> dataIntegrationUnits, DataFactoryElement<bool> enableSkipIncompatibleRow, RedirectIncompatibleRowSettings redirectIncompatibleRowSettings, LogStorageSettings logStorageSettings, DataFactoryLogSettings logSettings, IList<BinaryData> preserveRules, IList<BinaryData> preserve, DataFactoryElement<bool> validateDataConsistency, SkipErrorFile skipErrorFile) : base(name, activityType, description, state, onInactiveMarkAs, dependsOn, userProperties, additionalProperties, linkedServiceName, policy)
         {
             Inputs = inputs;
             Outputs = outputs;
diff --git a/src/AzureDataFactory.TestingFramework/Generated/Models/CopyActivitySource.cs b/src/AzureDataFactory.TestingFramework/Generated/Models/CopyActivitySource.cs
index 9c5548c1..8d212676 100644
--- a/src/AzureDataFactory.TestingFramework/Generated/Models/CopyActivitySource.cs
+++ b/src/AzureDataFactory.TestingFramework/Generated/Models/CopyActivitySource.cs
@@ -20,7 +20,7 @@ public partial class CopyActivitySource
         /// <summary> Initializes a new instance of CopyActivitySource. </summary>
         public CopyActivitySource()
         {
-            AdditionalProperties = new ChangeTrackingDictionary<string, BinaryData>();
+            AdditionalProperties = new ChangeTrackingDictionary<string, DataFactoryElement<string>>();
         }
 
         /// <summary> Initializes a new instance of CopyActivitySource. </summary>
@@ -30,7 +30,7 @@ public CopyActivitySource()
         /// <param name="maxConcurrentConnections"> The maximum concurrent connection count for the source data store. Type: integer (or Expression with resultType integer). </param>
         /// <param name="disableMetricsCollection"> If true, disable data store metrics collection. Default is false. Type: boolean (or Expression with resultType boolean). </param>
         /// <param name="additionalProperties"> Additional Properties. </param>
-        internal CopyActivitySource(string copySourceType, DataFactoryElement<int> sourceRetryCount, DataFactoryElement<string> sourceRetryWait, DataFactoryElement<int> maxConcurrentConnections, DataFactoryElement<bool> disableMetricsCollection, IDictionary<string, BinaryData> additionalProperties)
+        internal CopyActivitySource(string copySourceType, DataFactoryElement<int> sourceRetryCount, DataFactoryElement<string> sourceRetryWait, DataFactoryElement<int> maxConcurrentConnections, DataFactoryElement<bool> disableMetricsCollection, IDictionary<string, DataFactoryElement<string>> additionalProperties)
         {
             CopySourceType = copySourceType;
             SourceRetryCount = sourceRetryCount;
@@ -80,6 +80,6 @@ internal CopyActivitySource(string copySourceType, DataFactoryElement<int> sourc
         /// </list>
         /// </para>
         /// </summary>
-        public IDictionary<string, BinaryData> AdditionalProperties { get; }
+        public IDictionary<string, DataFactoryElement<string>> AdditionalProperties { get; }
     }
 }
diff --git a/src/AzureDataFactory.TestingFramework/Generated/Models/CopyComputeScaleProperties.Serialization.cs b/src/AzureDataFactory.TestingFramework/Generated/Models/CopyComputeScaleProperties.Serialization.cs
index 71191aee..7aa73f5c 100644
--- a/src/AzureDataFactory.TestingFramework/Generated/Models/CopyComputeScaleProperties.Serialization.cs
+++ b/src/AzureDataFactory.TestingFramework/Generated/Models/CopyComputeScaleProperties.Serialization.cs
@@ -7,6 +7,7 @@
 
 using System.Text.Json;
 using Azure.Core;
+using Azure.Core.Expressions.DataFactory;
 
 namespace AzureDataFactory.TestingFramework.Models
 {
@@ -45,8 +46,8 @@ internal static CopyComputeScaleProperties DeserializeCopyComputeScaleProperties
             }
             Optional<int> dataIntegrationUnit = default;
             Optional<int> timeToLive = default;
-            IDictionary<string, BinaryData> additionalProperties = default;
-            Dictionary<string, BinaryData> additionalPropertiesDictionary = new Dictionary<string, BinaryData>();
+            IDictionary<string, DataFactoryElement<string>> additionalProperties = default;
+            Dictionary<string, DataFactoryElement<string>> additionalPropertiesDictionary = new Dictionary<string, DataFactoryElement<string>>();
             foreach (var property in element.EnumerateObject())
             {
                 if (property.NameEquals("dataIntegrationUnit"u8))
@@ -67,7 +68,7 @@ internal static CopyComputeScaleProperties DeserializeCopyComputeScaleProperties
                     timeToLive = property.Value.GetInt32();
                     continue;
                 }
-                additionalPropertiesDictionary.Add(property.Name, BinaryData.FromString(property.Value.GetRawText()));
+                additionalPropertiesDictionary.Add(property.Name, JsonSerializer.Deserialize<DataFactoryElement<string>>(property.Value.GetRawText()));
             }
             additionalProperties = additionalPropertiesDictionary;
             return new CopyComputeScaleProperties(Optional.ToNullable(dataIntegrationUnit), Optional.ToNullable(timeToLive), additionalProperties);
diff --git a/src/AzureDataFactory.TestingFramework/Generated/Models/CopyComputeScaleProperties.cs b/src/AzureDataFactory.TestingFramework/Generated/Models/CopyComputeScaleProperties.cs
index 5a1bfeb7..5dcd7c98 100644
--- a/src/AzureDataFactory.TestingFramework/Generated/Models/CopyComputeScaleProperties.cs
+++ b/src/AzureDataFactory.TestingFramework/Generated/Models/CopyComputeScaleProperties.cs
@@ -6,6 +6,7 @@
 #nullable disable
 
 using Azure.Core;
+using Azure.Core.Expressions.DataFactory;
 
 namespace AzureDataFactory.TestingFramework.Models
 {
@@ -15,14 +16,14 @@ public partial class CopyComputeScaleProperties
         /// <summary> Initializes a new instance of CopyComputeScaleProperties. </summary>
         public CopyComputeScaleProperties()
         {
-            AdditionalProperties = new ChangeTrackingDictionary<string, BinaryData>();
+            AdditionalProperties = new ChangeTrackingDictionary<string, DataFactoryElement<string>>();
         }
 
         /// <summary> Initializes a new instance of CopyComputeScaleProperties. </summary>
         /// <param name="dataIntegrationUnit"> DIU number setting reserved for copy activity execution. Supported values are multiples of 4 in range 4-256. </param>
         /// <param name="timeToLive"> Time to live (in minutes) setting of integration runtime which will execute copy activity. </param>
         /// <param name="additionalProperties"> Additional Properties. </param>
-        internal CopyComputeScaleProperties(int? dataIntegrationUnit, int? timeToLive, IDictionary<string, BinaryData> additionalProperties)
+        internal CopyComputeScaleProperties(int? dataIntegrationUnit, int? timeToLive, IDictionary<string, DataFactoryElement<string>> additionalProperties)
         {
             DataIntegrationUnit = dataIntegrationUnit;
             TimeToLive = timeToLive;
@@ -63,6 +64,6 @@ internal CopyComputeScaleProperties(int? dataIntegrationUnit, int? timeToLive, I
         /// </list>
         /// </para>
         /// </summary>
-        public IDictionary<string, BinaryData> AdditionalProperties { get; }
+        public IDictionary<string, DataFactoryElement<string>> AdditionalProperties { get; }
     }
 }
diff --git a/src/AzureDataFactory.TestingFramework/Generated/Models/CopySink.cs b/src/AzureDataFactory.TestingFramework/Generated/Models/CopySink.cs
index fa6d3986..4f3c45f7 100644
--- a/src/AzureDataFactory.TestingFramework/Generated/Models/CopySink.cs
+++ b/src/AzureDataFactory.TestingFramework/Generated/Models/CopySink.cs
@@ -20,7 +20,7 @@ public partial class CopySink
         /// <summary> Initializes a new instance of CopySink. </summary>
         public CopySink()
         {
-            AdditionalProperties = new ChangeTrackingDictionary<string, BinaryData>();
+            AdditionalProperties = new ChangeTrackingDictionary<string, DataFactoryElement<string>>();
         }
 
         /// <summary> Initializes a new instance of CopySink. </summary>
@@ -32,7 +32,7 @@ public CopySink()
         /// <param name="maxConcurrentConnections"> The maximum concurrent connection count for the sink data store. Type: integer (or Expression with resultType integer). </param>
         /// <param name="disableMetricsCollection"> If true, disable data store metrics collection. Default is false. Type: boolean (or Expression with resultType boolean). </param>
         /// <param name="additionalProperties"> Additional Properties. </param>
-        internal CopySink(string copySinkType, DataFactoryElement<int> writeBatchSize, DataFactoryElement<string> writeBatchTimeout, DataFactoryElement<int> sinkRetryCount, DataFactoryElement<string> sinkRetryWait, DataFactoryElement<int> maxConcurrentConnections, DataFactoryElement<bool> disableMetricsCollection, IDictionary<string, BinaryData> additionalProperties)
+        internal CopySink(string copySinkType, DataFactoryElement<int> writeBatchSize, DataFactoryElement<string> writeBatchTimeout, DataFactoryElement<int> sinkRetryCount, DataFactoryElement<string> sinkRetryWait, DataFactoryElement<int> maxConcurrentConnections, DataFactoryElement<bool> disableMetricsCollection, IDictionary<string, DataFactoryElement<string>> additionalProperties)
         {
             CopySinkType = copySinkType;
             WriteBatchSize = writeBatchSize;
@@ -88,6 +88,6 @@ internal CopySink(string copySinkType, DataFactoryElement<int> writeBatchSize, D
         /// </list>
         /// </para>
         /// </summary>
-        public IDictionary<string, BinaryData> AdditionalProperties { get; }
+        public IDictionary<string, DataFactoryElement<string>> AdditionalProperties { get; }
     }
 }
diff --git a/src/AzureDataFactory.TestingFramework/Generated/Models/CosmosDBLinkedService.Serialization.cs b/src/AzureDataFactory.TestingFramework/Generated/Models/CosmosDBLinkedService.Serialization.cs
index bf22b069..6a90a2eb 100644
--- a/src/AzureDataFactory.TestingFramework/Generated/Models/CosmosDBLinkedService.Serialization.cs
+++ b/src/AzureDataFactory.TestingFramework/Generated/Models/CosmosDBLinkedService.Serialization.cs
@@ -156,8 +156,8 @@ internal static CosmosDBLinkedService DeserializeCosmosDBLinkedService(JsonEleme
             Optional<CosmosDBConnectionMode> connectionMode = default;
             Optional<string> encryptedCredential = default;
             Optional<DataFactoryCredentialReference> credential = default;
-            IDictionary<string, BinaryData> additionalProperties = default;
-            Dictionary<string, BinaryData> additionalPropertiesDictionary = new Dictionary<string, BinaryData>();
+            IDictionary<string, DataFactoryElement<string>> additionalProperties = default;
+            Dictionary<string, DataFactoryElement<string>> additionalPropertiesDictionary = new Dictionary<string, DataFactoryElement<string>>();
             foreach (var property in element.EnumerateObject())
             {
                 if (property.NameEquals("type"u8))
@@ -330,7 +330,7 @@ internal static CosmosDBLinkedService DeserializeCosmosDBLinkedService(JsonEleme
                     }
                     continue;
                 }
-                additionalPropertiesDictionary.Add(property.Name, BinaryData.FromString(property.Value.GetRawText()));
+                additionalPropertiesDictionary.Add(property.Name, JsonSerializer.Deserialize<DataFactoryElement<string>>(property.Value.GetRawText()));
             }
             additionalProperties = additionalPropertiesDictionary;
             return new CosmosDBLinkedService(type, connectVia.Value, description.Value, Optional.ToDictionary(parameters), Optional.ToList(annotations), additionalProperties, connectionString.Value, accountEndpoint.Value, database.Value, accountKey, servicePrincipalId.Value, servicePrincipalCredentialType.Value, servicePrincipalCredential, tenant.Value, azureCloudType.Value, Optional.ToNullable(connectionMode), encryptedCredential.Value, credential.Value);
diff --git a/src/AzureDataFactory.TestingFramework/Generated/Models/CosmosDBLinkedService.cs b/src/AzureDataFactory.TestingFramework/Generated/Models/CosmosDBLinkedService.cs
index efabcecd..f3c7ba28 100644
--- a/src/AzureDataFactory.TestingFramework/Generated/Models/CosmosDBLinkedService.cs
+++ b/src/AzureDataFactory.TestingFramework/Generated/Models/CosmosDBLinkedService.cs
@@ -37,7 +37,7 @@ public CosmosDBLinkedService()
         /// <param name="connectionMode"> The connection mode used to access CosmosDB account. Type: string. </param>
         /// <param name="encryptedCredential"> The encrypted credential used for authentication. Credentials are encrypted using the integration runtime credential manager. Type: string. </param>
         /// <param name="credential"> The credential reference containing authentication information. </param>
-        internal CosmosDBLinkedService(string linkedServiceType, IntegrationRuntimeReference connectVia, string description, IDictionary<string, EntityParameterSpecification> parameters, IList<BinaryData> annotations, IDictionary<string, BinaryData> additionalProperties, DataFactoryElement<string> connectionString, DataFactoryElement<string> accountEndpoint, DataFactoryElement<string> database, DataFactorySecretBaseDefinition accountKey, DataFactoryElement<string> servicePrincipalId, DataFactoryElement<string> servicePrincipalCredentialType, DataFactorySecretBaseDefinition servicePrincipalCredential, DataFactoryElement<string> tenant, DataFactoryElement<string> azureCloudType, CosmosDBConnectionMode? connectionMode, string encryptedCredential, DataFactoryCredentialReference credential) : base(linkedServiceType, connectVia, description, parameters, annotations, additionalProperties)
+        internal CosmosDBLinkedService(string linkedServiceType, IntegrationRuntimeReference connectVia, string description, IDictionary<string, EntityParameterSpecification> parameters, IList<BinaryData> annotations, IDictionary<string, DataFactoryElement<string>> additionalProperties, DataFactoryElement<string> connectionString, DataFactoryElement<string> accountEndpoint, DataFactoryElement<string> database, DataFactorySecretBaseDefinition accountKey, DataFactoryElement<string> servicePrincipalId, DataFactoryElement<string> servicePrincipalCredentialType, DataFactorySecretBaseDefinition servicePrincipalCredential, DataFactoryElement<string> tenant, DataFactoryElement<string> azureCloudType, CosmosDBConnectionMode? connectionMode, string encryptedCredential, DataFactoryCredentialReference credential) : base(linkedServiceType, connectVia, description, parameters, annotations, additionalProperties)
         {
             ConnectionString = connectionString;
             AccountEndpoint = accountEndpoint;
diff --git a/src/AzureDataFactory.TestingFramework/Generated/Models/CosmosDBMongoDBApiCollectionDataset.Serialization.cs b/src/AzureDataFactory.TestingFramework/Generated/Models/CosmosDBMongoDBApiCollectionDataset.Serialization.cs
index 45ccbf60..102a76ad 100644
--- a/src/AzureDataFactory.TestingFramework/Generated/Models/CosmosDBMongoDBApiCollectionDataset.Serialization.cs
+++ b/src/AzureDataFactory.TestingFramework/Generated/Models/CosmosDBMongoDBApiCollectionDataset.Serialization.cs
@@ -101,8 +101,8 @@ internal static CosmosDBMongoDBApiCollectionDataset DeserializeCosmosDBMongoDBAp
             Optional<IList<BinaryData>> annotations = default;
             Optional<DatasetFolder> folder = default;
             DataFactoryElement<string> collection = default;
-            IDictionary<string, BinaryData> additionalProperties = default;
-            Dictionary<string, BinaryData> additionalPropertiesDictionary = new Dictionary<string, BinaryData>();
+            IDictionary<string, DataFactoryElement<string>> additionalProperties = default;
+            Dictionary<string, DataFactoryElement<string>> additionalPropertiesDictionary = new Dictionary<string, DataFactoryElement<string>>();
             foreach (var property in element.EnumerateObject())
             {
                 if (property.NameEquals("type"u8))
@@ -199,7 +199,7 @@ internal static CosmosDBMongoDBApiCollectionDataset DeserializeCosmosDBMongoDBAp
                     }
                     continue;
                 }
-                additionalPropertiesDictionary.Add(property.Name, BinaryData.FromString(property.Value.GetRawText()));
+                additionalPropertiesDictionary.Add(property.Name, JsonSerializer.Deserialize<DataFactoryElement<string>>(property.Value.GetRawText()));
             }
             additionalProperties = additionalPropertiesDictionary;
             return new CosmosDBMongoDBApiCollectionDataset(type, description.Value, structure.Value, schema.Value, linkedServiceName, Optional.ToDictionary(parameters), Optional.ToList(annotations), folder.Value, additionalProperties, collection);
diff --git a/src/AzureDataFactory.TestingFramework/Generated/Models/CosmosDBMongoDBApiCollectionDataset.cs b/src/AzureDataFactory.TestingFramework/Generated/Models/CosmosDBMongoDBApiCollectionDataset.cs
index 949caf1f..ddf586a5 100644
--- a/src/AzureDataFactory.TestingFramework/Generated/Models/CosmosDBMongoDBApiCollectionDataset.cs
+++ b/src/AzureDataFactory.TestingFramework/Generated/Models/CosmosDBMongoDBApiCollectionDataset.cs
@@ -37,7 +37,7 @@ public CosmosDBMongoDBApiCollectionDataset(DataFactoryLinkedServiceReference lin
         /// <param name="folder"> The folder that this Dataset is in. If not specified, Dataset will appear at the root level. </param>
         /// <param name="additionalProperties"> Additional Properties. </param>
         /// <param name="collection"> The collection name of the CosmosDB (MongoDB API) database. Type: string (or Expression with resultType string). </param>
-        internal CosmosDBMongoDBApiCollectionDataset(string datasetType, string description, DataFactoryElement<IList<DatasetDataElement>> structure, DataFactoryElement<IList<DatasetSchemaDataElement>> schema, DataFactoryLinkedServiceReference linkedServiceName, IDictionary<string, EntityParameterSpecification> parameters, IList<BinaryData> annotations, DatasetFolder folder, IDictionary<string, BinaryData> additionalProperties, DataFactoryElement<string> collection) : base(datasetType, description, structure, schema, linkedServiceName, parameters, annotations, folder, additionalProperties)
+        internal CosmosDBMongoDBApiCollectionDataset(string datasetType, string description, DataFactoryElement<IList<DatasetDataElement>> structure, DataFactoryElement<IList<DatasetSchemaDataElement>> schema, DataFactoryLinkedServiceReference linkedServiceName, IDictionary<string, EntityParameterSpecification> parameters, IList<BinaryData> annotations, DatasetFolder folder, IDictionary<string, DataFactoryElement<string>> additionalProperties, DataFactoryElement<string> collection) : base(datasetType, description, structure, schema, linkedServiceName, parameters, annotations, folder, additionalProperties)
         {
             Collection = collection;
             DatasetType = datasetType ?? "CosmosDbMongoDbApiCollection";
diff --git a/src/AzureDataFactory.TestingFramework/Generated/Models/CosmosDBMongoDBApiLinkedService.Serialization.cs b/src/AzureDataFactory.TestingFramework/Generated/Models/CosmosDBMongoDBApiLinkedService.Serialization.cs
index 52887aed..d8d4775b 100644
--- a/src/AzureDataFactory.TestingFramework/Generated/Models/CosmosDBMongoDBApiLinkedService.Serialization.cs
+++ b/src/AzureDataFactory.TestingFramework/Generated/Models/CosmosDBMongoDBApiLinkedService.Serialization.cs
@@ -96,8 +96,8 @@ internal static CosmosDBMongoDBApiLinkedService DeserializeCosmosDBMongoDBApiLin
             Optional<DataFactoryElement<bool>> isServerVersionAbove32 = default;
             DataFactoryElement<string> connectionString = default;
             DataFactoryElement<string> database = default;
-            IDictionary<string, BinaryData> additionalProperties = default;
-            Dictionary<string, BinaryData> additionalPropertiesDictionary = new Dictionary<string, BinaryData>();
+            IDictionary<string, DataFactoryElement<string>> additionalProperties = default;
+            Dictionary<string, DataFactoryElement<string>> additionalPropertiesDictionary = new Dictionary<string, DataFactoryElement<string>>();
             foreach (var property in element.EnumerateObject())
             {
                 if (property.NameEquals("type"u8))
@@ -185,7 +185,7 @@ internal static CosmosDBMongoDBApiLinkedService DeserializeCosmosDBMongoDBApiLin
                     }
                     continue;
                 }
-                additionalPropertiesDictionary.Add(property.Name, BinaryData.FromString(property.Value.GetRawText()));
+                additionalPropertiesDictionary.Add(property.Name, JsonSerializer.Deserialize<DataFactoryElement<string>>(property.Value.GetRawText()));
             }
             additionalProperties = additionalPropertiesDictionary;
             return new CosmosDBMongoDBApiLinkedService(type, connectVia.Value, description.Value, Optional.ToDictionary(parameters), Optional.ToList(annotations), additionalProperties, isServerVersionAbove32.Value, connectionString, database);
diff --git a/src/AzureDataFactory.TestingFramework/Generated/Models/CosmosDBMongoDBApiLinkedService.cs b/src/AzureDataFactory.TestingFramework/Generated/Models/CosmosDBMongoDBApiLinkedService.cs
index 772bbb41..73733384 100644
--- a/src/AzureDataFactory.TestingFramework/Generated/Models/CosmosDBMongoDBApiLinkedService.cs
+++ b/src/AzureDataFactory.TestingFramework/Generated/Models/CosmosDBMongoDBApiLinkedService.cs
@@ -37,7 +37,7 @@ public CosmosDBMongoDBApiLinkedService(DataFactoryElement<string> connectionStri
         /// <param name="isServerVersionAbove32"> Whether the CosmosDB (MongoDB API) server version is higher than 3.2. The default value is false. Type: boolean (or Expression with resultType boolean). </param>
         /// <param name="connectionString"> The CosmosDB (MongoDB API) connection string. Type: string, SecureString or AzureKeyVaultSecretReference. Type: string, SecureString or AzureKeyVaultSecretReference. </param>
         /// <param name="database"> The name of the CosmosDB (MongoDB API) database that you want to access. Type: string (or Expression with resultType string). </param>
-        internal CosmosDBMongoDBApiLinkedService(string linkedServiceType, IntegrationRuntimeReference connectVia, string description, IDictionary<string, EntityParameterSpecification> parameters, IList<BinaryData> annotations, IDictionary<string, BinaryData> additionalProperties, DataFactoryElement<bool> isServerVersionAbove32, DataFactoryElement<string> connectionString, DataFactoryElement<string> database) : base(linkedServiceType, connectVia, description, parameters, annotations, additionalProperties)
+        internal CosmosDBMongoDBApiLinkedService(string linkedServiceType, IntegrationRuntimeReference connectVia, string description, IDictionary<string, EntityParameterSpecification> parameters, IList<BinaryData> annotations, IDictionary<string, DataFactoryElement<string>> additionalProperties, DataFactoryElement<bool> isServerVersionAbove32, DataFactoryElement<string> connectionString, DataFactoryElement<string> database) : base(linkedServiceType, connectVia, description, parameters, annotations, additionalProperties)
         {
             IsServerVersionAbove32 = isServerVersionAbove32;
             ConnectionString = connectionString;
diff --git a/src/AzureDataFactory.TestingFramework/Generated/Models/CosmosDBMongoDBApiSink.Serialization.cs b/src/AzureDataFactory.TestingFramework/Generated/Models/CosmosDBMongoDBApiSink.Serialization.cs
index 9b1e6e05..10716ccd 100644
--- a/src/AzureDataFactory.TestingFramework/Generated/Models/CosmosDBMongoDBApiSink.Serialization.cs
+++ b/src/AzureDataFactory.TestingFramework/Generated/Models/CosmosDBMongoDBApiSink.Serialization.cs
@@ -79,8 +79,8 @@ internal static CosmosDBMongoDBApiSink DeserializeCosmosDBMongoDBApiSink(JsonEle
             Optional<DataFactoryElement<string>> sinkRetryWait = default;
             Optional<DataFactoryElement<int>> maxConcurrentConnections = default;
             Optional<DataFactoryElement<bool>> disableMetricsCollection = default;
-            IDictionary<string, BinaryData> additionalProperties = default;
-            Dictionary<string, BinaryData> additionalPropertiesDictionary = new Dictionary<string, BinaryData>();
+            IDictionary<string, DataFactoryElement<string>> additionalProperties = default;
+            Dictionary<string, DataFactoryElement<string>> additionalPropertiesDictionary = new Dictionary<string, DataFactoryElement<string>>();
             foreach (var property in element.EnumerateObject())
             {
                 if (property.NameEquals("writeBehavior"u8))
@@ -151,7 +151,7 @@ internal static CosmosDBMongoDBApiSink DeserializeCosmosDBMongoDBApiSink(JsonEle
                     disableMetricsCollection = JsonSerializer.Deserialize<DataFactoryElement<bool>>(property.Value.GetRawText());
                     continue;
                 }
-                additionalPropertiesDictionary.Add(property.Name, BinaryData.FromString(property.Value.GetRawText()));
+                additionalPropertiesDictionary.Add(property.Name, JsonSerializer.Deserialize<DataFactoryElement<string>>(property.Value.GetRawText()));
             }
             additionalProperties = additionalPropertiesDictionary;
             return new CosmosDBMongoDBApiSink(type, writeBatchSize.Value, writeBatchTimeout.Value, sinkRetryCount.Value, sinkRetryWait.Value, maxConcurrentConnections.Value, disableMetricsCollection.Value, additionalProperties, writeBehavior.Value);
diff --git a/src/AzureDataFactory.TestingFramework/Generated/Models/CosmosDBMongoDBApiSink.cs b/src/AzureDataFactory.TestingFramework/Generated/Models/CosmosDBMongoDBApiSink.cs
index dfb8b568..0afe1fc8 100644
--- a/src/AzureDataFactory.TestingFramework/Generated/Models/CosmosDBMongoDBApiSink.cs
+++ b/src/AzureDataFactory.TestingFramework/Generated/Models/CosmosDBMongoDBApiSink.cs
@@ -28,7 +28,7 @@ public CosmosDBMongoDBApiSink()
         /// <param name="disableMetricsCollection"> If true, disable data store metrics collection. Default is false. Type: boolean (or Expression with resultType boolean). </param>
         /// <param name="additionalProperties"> Additional Properties. </param>
         /// <param name="writeBehavior"> Specifies whether the document with same key to be overwritten (upsert) rather than throw exception (insert). The default value is "insert". Type: string (or Expression with resultType string). Type: string (or Expression with resultType string). </param>
-        internal CosmosDBMongoDBApiSink(string copySinkType, DataFactoryElement<int> writeBatchSize, DataFactoryElement<string> writeBatchTimeout, DataFactoryElement<int> sinkRetryCount, DataFactoryElement<string> sinkRetryWait, DataFactoryElement<int> maxConcurrentConnections, DataFactoryElement<bool> disableMetricsCollection, IDictionary<string, BinaryData> additionalProperties, DataFactoryElement<string> writeBehavior) : base(copySinkType, writeBatchSize, writeBatchTimeout, sinkRetryCount, sinkRetryWait, maxConcurrentConnections, disableMetricsCollection, additionalProperties)
+        internal CosmosDBMongoDBApiSink(string copySinkType, DataFactoryElement<int> writeBatchSize, DataFactoryElement<string> writeBatchTimeout, DataFactoryElement<int> sinkRetryCount, DataFactoryElement<string> sinkRetryWait, DataFactoryElement<int> maxConcurrentConnections, DataFactoryElement<bool> disableMetricsCollection, IDictionary<string, DataFactoryElement<string>> additionalProperties, DataFactoryElement<string> writeBehavior) : base(copySinkType, writeBatchSize, writeBatchTimeout, sinkRetryCount, sinkRetryWait, maxConcurrentConnections, disableMetricsCollection, additionalProperties)
         {
             WriteBehavior = writeBehavior;
             CopySinkType = copySinkType ?? "CosmosDbMongoDbApiSink";
diff --git a/src/AzureDataFactory.TestingFramework/Generated/Models/CosmosDBMongoDBApiSource.Serialization.cs b/src/AzureDataFactory.TestingFramework/Generated/Models/CosmosDBMongoDBApiSource.Serialization.cs
index 40dbde5b..e80a4af2 100644
--- a/src/AzureDataFactory.TestingFramework/Generated/Models/CosmosDBMongoDBApiSource.Serialization.cs
+++ b/src/AzureDataFactory.TestingFramework/Generated/Models/CosmosDBMongoDBApiSource.Serialization.cs
@@ -95,8 +95,8 @@ internal static CosmosDBMongoDBApiSource DeserializeCosmosDBMongoDBApiSource(Jso
             Optional<DataFactoryElement<string>> sourceRetryWait = default;
             Optional<DataFactoryElement<int>> maxConcurrentConnections = default;
             Optional<DataFactoryElement<bool>> disableMetricsCollection = default;
-            IDictionary<string, BinaryData> additionalProperties = default;
-            Dictionary<string, BinaryData> additionalPropertiesDictionary = new Dictionary<string, BinaryData>();
+            IDictionary<string, DataFactoryElement<string>> additionalProperties = default;
+            Dictionary<string, DataFactoryElement<string>> additionalPropertiesDictionary = new Dictionary<string, DataFactoryElement<string>>();
             foreach (var property in element.EnumerateObject())
             {
                 if (property.NameEquals("filter"u8))
@@ -185,7 +185,7 @@ internal static CosmosDBMongoDBApiSource DeserializeCosmosDBMongoDBApiSource(Jso
                     disableMetricsCollection = JsonSerializer.Deserialize<DataFactoryElement<bool>>(property.Value.GetRawText());
                     continue;
                 }
-                additionalPropertiesDictionary.Add(property.Name, BinaryData.FromString(property.Value.GetRawText()));
+                additionalPropertiesDictionary.Add(property.Name, JsonSerializer.Deserialize<DataFactoryElement<string>>(property.Value.GetRawText()));
             }
             additionalProperties = additionalPropertiesDictionary;
             return new CosmosDBMongoDBApiSource(type, sourceRetryCount.Value, sourceRetryWait.Value, maxConcurrentConnections.Value, disableMetricsCollection.Value, additionalProperties, filter.Value, cursorMethods.Value, batchSize.Value, queryTimeout.Value, additionalColumns.Value);
diff --git a/src/AzureDataFactory.TestingFramework/Generated/Models/CosmosDBMongoDBApiSource.cs b/src/AzureDataFactory.TestingFramework/Generated/Models/CosmosDBMongoDBApiSource.cs
index b35a8348..e2745577 100644
--- a/src/AzureDataFactory.TestingFramework/Generated/Models/CosmosDBMongoDBApiSource.cs
+++ b/src/AzureDataFactory.TestingFramework/Generated/Models/CosmosDBMongoDBApiSource.cs
@@ -30,7 +30,7 @@ public CosmosDBMongoDBApiSource()
         /// <param name="batchSize"> Specifies the number of documents to return in each batch of the response from MongoDB instance. In most cases, modifying the batch size will not affect the user or the application. This property's main purpose is to avoid hit the limitation of response size. Type: integer (or Expression with resultType integer). </param>
         /// <param name="queryTimeout"> Query timeout. Type: string (or Expression with resultType string), pattern: ((\d+)\.)?(\d\d):(60|([0-5][0-9])):(60|([0-5][0-9])). </param>
         /// <param name="additionalColumns"> Specifies the additional columns to be added to source data. Type: array of objects(AdditionalColumns) (or Expression with resultType array of objects). </param>
-        internal CosmosDBMongoDBApiSource(string copySourceType, DataFactoryElement<int> sourceRetryCount, DataFactoryElement<string> sourceRetryWait, DataFactoryElement<int> maxConcurrentConnections, DataFactoryElement<bool> disableMetricsCollection, IDictionary<string, BinaryData> additionalProperties, DataFactoryElement<string> filter, MongoDBCursorMethodsProperties cursorMethods, DataFactoryElement<int> batchSize, DataFactoryElement<string> queryTimeout, BinaryData additionalColumns) : base(copySourceType, sourceRetryCount, sourceRetryWait, maxConcurrentConnections, disableMetricsCollection, additionalProperties)
+        internal CosmosDBMongoDBApiSource(string copySourceType, DataFactoryElement<int> sourceRetryCount, DataFactoryElement<string> sourceRetryWait, DataFactoryElement<int> maxConcurrentConnections, DataFactoryElement<bool> disableMetricsCollection, IDictionary<string, DataFactoryElement<string>> additionalProperties, DataFactoryElement<string> filter, MongoDBCursorMethodsProperties cursorMethods, DataFactoryElement<int> batchSize, DataFactoryElement<string> queryTimeout, BinaryData additionalColumns) : base(copySourceType, sourceRetryCount, sourceRetryWait, maxConcurrentConnections, disableMetricsCollection, additionalProperties)
         {
             Filter = filter;
             CursorMethods = cursorMethods;
diff --git a/src/AzureDataFactory.TestingFramework/Generated/Models/CosmosDBSqlApiCollectionDataset.Serialization.cs b/src/AzureDataFactory.TestingFramework/Generated/Models/CosmosDBSqlApiCollectionDataset.Serialization.cs
index 06495d13..9ddc70cc 100644
--- a/src/AzureDataFactory.TestingFramework/Generated/Models/CosmosDBSqlApiCollectionDataset.Serialization.cs
+++ b/src/AzureDataFactory.TestingFramework/Generated/Models/CosmosDBSqlApiCollectionDataset.Serialization.cs
@@ -101,8 +101,8 @@ internal static CosmosDBSqlApiCollectionDataset DeserializeCosmosDBSqlApiCollect
             Optional<IList<BinaryData>> annotations = default;
             Optional<DatasetFolder> folder = default;
             DataFactoryElement<string> collectionName = default;
-            IDictionary<string, BinaryData> additionalProperties = default;
-            Dictionary<string, BinaryData> additionalPropertiesDictionary = new Dictionary<string, BinaryData>();
+            IDictionary<string, DataFactoryElement<string>> additionalProperties = default;
+            Dictionary<string, DataFactoryElement<string>> additionalPropertiesDictionary = new Dictionary<string, DataFactoryElement<string>>();
             foreach (var property in element.EnumerateObject())
             {
                 if (property.NameEquals("type"u8))
@@ -199,7 +199,7 @@ internal static CosmosDBSqlApiCollectionDataset DeserializeCosmosDBSqlApiCollect
                     }
                     continue;
                 }
-                additionalPropertiesDictionary.Add(property.Name, BinaryData.FromString(property.Value.GetRawText()));
+                additionalPropertiesDictionary.Add(property.Name, JsonSerializer.Deserialize<DataFactoryElement<string>>(property.Value.GetRawText()));
             }
             additionalProperties = additionalPropertiesDictionary;
             return new CosmosDBSqlApiCollectionDataset(type, description.Value, structure.Value, schema.Value, linkedServiceName, Optional.ToDictionary(parameters), Optional.ToList(annotations), folder.Value, additionalProperties, collectionName);
diff --git a/src/AzureDataFactory.TestingFramework/Generated/Models/CosmosDBSqlApiCollectionDataset.cs b/src/AzureDataFactory.TestingFramework/Generated/Models/CosmosDBSqlApiCollectionDataset.cs
index 9d31e538..ef32bfd3 100644
--- a/src/AzureDataFactory.TestingFramework/Generated/Models/CosmosDBSqlApiCollectionDataset.cs
+++ b/src/AzureDataFactory.TestingFramework/Generated/Models/CosmosDBSqlApiCollectionDataset.cs
@@ -37,7 +37,7 @@ public CosmosDBSqlApiCollectionDataset(DataFactoryLinkedServiceReference linkedS
         /// <param name="folder"> The folder that this Dataset is in. If not specified, Dataset will appear at the root level. </param>
         /// <param name="additionalProperties"> Additional Properties. </param>
         /// <param name="collectionName"> CosmosDB (SQL API) collection name. Type: string (or Expression with resultType string). </param>
-        internal CosmosDBSqlApiCollectionDataset(string datasetType, string description, DataFactoryElement<IList<DatasetDataElement>> structure, DataFactoryElement<IList<DatasetSchemaDataElement>> schema, DataFactoryLinkedServiceReference linkedServiceName, IDictionary<string, EntityParameterSpecification> parameters, IList<BinaryData> annotations, DatasetFolder folder, IDictionary<string, BinaryData> additionalProperties, DataFactoryElement<string> collectionName) : base(datasetType, description, structure, schema, linkedServiceName, parameters, annotations, folder, additionalProperties)
+        internal CosmosDBSqlApiCollectionDataset(string datasetType, string description, DataFactoryElement<IList<DatasetDataElement>> structure, DataFactoryElement<IList<DatasetSchemaDataElement>> schema, DataFactoryLinkedServiceReference linkedServiceName, IDictionary<string, EntityParameterSpecification> parameters, IList<BinaryData> annotations, DatasetFolder folder, IDictionary<string, DataFactoryElement<string>> additionalProperties, DataFactoryElement<string> collectionName) : base(datasetType, description, structure, schema, linkedServiceName, parameters, annotations, folder, additionalProperties)
         {
             CollectionName = collectionName;
             DatasetType = datasetType ?? "CosmosDbSqlApiCollection";
diff --git a/src/AzureDataFactory.TestingFramework/Generated/Models/CosmosDBSqlApiSink.Serialization.cs b/src/AzureDataFactory.TestingFramework/Generated/Models/CosmosDBSqlApiSink.Serialization.cs
index 392bd0e0..5d1d318a 100644
--- a/src/AzureDataFactory.TestingFramework/Generated/Models/CosmosDBSqlApiSink.Serialization.cs
+++ b/src/AzureDataFactory.TestingFramework/Generated/Models/CosmosDBSqlApiSink.Serialization.cs
@@ -79,8 +79,8 @@ internal static CosmosDBSqlApiSink DeserializeCosmosDBSqlApiSink(JsonElement ele
             Optional<DataFactoryElement<string>> sinkRetryWait = default;
             Optional<DataFactoryElement<int>> maxConcurrentConnections = default;
             Optional<DataFactoryElement<bool>> disableMetricsCollection = default;
-            IDictionary<string, BinaryData> additionalProperties = default;
-            Dictionary<string, BinaryData> additionalPropertiesDictionary = new Dictionary<string, BinaryData>();
+            IDictionary<string, DataFactoryElement<string>> additionalProperties = default;
+            Dictionary<string, DataFactoryElement<string>> additionalPropertiesDictionary = new Dictionary<string, DataFactoryElement<string>>();
             foreach (var property in element.EnumerateObject())
             {
                 if (property.NameEquals("writeBehavior"u8))
@@ -151,7 +151,7 @@ internal static CosmosDBSqlApiSink DeserializeCosmosDBSqlApiSink(JsonElement ele
                     disableMetricsCollection = JsonSerializer.Deserialize<DataFactoryElement<bool>>(property.Value.GetRawText());
                     continue;
                 }
-                additionalPropertiesDictionary.Add(property.Name, BinaryData.FromString(property.Value.GetRawText()));
+                additionalPropertiesDictionary.Add(property.Name, JsonSerializer.Deserialize<DataFactoryElement<string>>(property.Value.GetRawText()));
             }
             additionalProperties = additionalPropertiesDictionary;
             return new CosmosDBSqlApiSink(type, writeBatchSize.Value, writeBatchTimeout.Value, sinkRetryCount.Value, sinkRetryWait.Value, maxConcurrentConnections.Value, disableMetricsCollection.Value, additionalProperties, writeBehavior.Value);
diff --git a/src/AzureDataFactory.TestingFramework/Generated/Models/CosmosDBSqlApiSink.cs b/src/AzureDataFactory.TestingFramework/Generated/Models/CosmosDBSqlApiSink.cs
index a351733e..e2ed04ce 100644
--- a/src/AzureDataFactory.TestingFramework/Generated/Models/CosmosDBSqlApiSink.cs
+++ b/src/AzureDataFactory.TestingFramework/Generated/Models/CosmosDBSqlApiSink.cs
@@ -28,7 +28,7 @@ public CosmosDBSqlApiSink()
         /// <param name="disableMetricsCollection"> If true, disable data store metrics collection. Default is false. Type: boolean (or Expression with resultType boolean). </param>
         /// <param name="additionalProperties"> Additional Properties. </param>
         /// <param name="writeBehavior"> Describes how to write data to Azure Cosmos DB. Type: string (or Expression with resultType string). Allowed values: insert and upsert. </param>
-        internal CosmosDBSqlApiSink(string copySinkType, DataFactoryElement<int> writeBatchSize, DataFactoryElement<string> writeBatchTimeout, DataFactoryElement<int> sinkRetryCount, DataFactoryElement<string> sinkRetryWait, DataFactoryElement<int> maxConcurrentConnections, DataFactoryElement<bool> disableMetricsCollection, IDictionary<string, BinaryData> additionalProperties, DataFactoryElement<string> writeBehavior) : base(copySinkType, writeBatchSize, writeBatchTimeout, sinkRetryCount, sinkRetryWait, maxConcurrentConnections, disableMetricsCollection, additionalProperties)
+        internal CosmosDBSqlApiSink(string copySinkType, DataFactoryElement<int> writeBatchSize, DataFactoryElement<string> writeBatchTimeout, DataFactoryElement<int> sinkRetryCount, DataFactoryElement<string> sinkRetryWait, DataFactoryElement<int> maxConcurrentConnections, DataFactoryElement<bool> disableMetricsCollection, IDictionary<string, DataFactoryElement<string>> additionalProperties, DataFactoryElement<string> writeBehavior) : base(copySinkType, writeBatchSize, writeBatchTimeout, sinkRetryCount, sinkRetryWait, maxConcurrentConnections, disableMetricsCollection, additionalProperties)
         {
             WriteBehavior = writeBehavior;
             CopySinkType = copySinkType ?? "CosmosDbSqlApiSink";
diff --git a/src/AzureDataFactory.TestingFramework/Generated/Models/CosmosDBSqlApiSource.Serialization.cs b/src/AzureDataFactory.TestingFramework/Generated/Models/CosmosDBSqlApiSource.Serialization.cs
index c274a3c4..ae47c3af 100644
--- a/src/AzureDataFactory.TestingFramework/Generated/Models/CosmosDBSqlApiSource.Serialization.cs
+++ b/src/AzureDataFactory.TestingFramework/Generated/Models/CosmosDBSqlApiSource.Serialization.cs
@@ -95,8 +95,8 @@ internal static CosmosDBSqlApiSource DeserializeCosmosDBSqlApiSource(JsonElement
             Optional<DataFactoryElement<string>> sourceRetryWait = default;
             Optional<DataFactoryElement<int>> maxConcurrentConnections = default;
             Optional<DataFactoryElement<bool>> disableMetricsCollection = default;
-            IDictionary<string, BinaryData> additionalProperties = default;
-            Dictionary<string, BinaryData> additionalPropertiesDictionary = new Dictionary<string, BinaryData>();
+            IDictionary<string, DataFactoryElement<string>> additionalProperties = default;
+            Dictionary<string, DataFactoryElement<string>> additionalPropertiesDictionary = new Dictionary<string, DataFactoryElement<string>>();
             foreach (var property in element.EnumerateObject())
             {
                 if (property.NameEquals("query"u8))
@@ -185,7 +185,7 @@ internal static CosmosDBSqlApiSource DeserializeCosmosDBSqlApiSource(JsonElement
                     disableMetricsCollection = JsonSerializer.Deserialize<DataFactoryElement<bool>>(property.Value.GetRawText());
                     continue;
                 }
-                additionalPropertiesDictionary.Add(property.Name, BinaryData.FromString(property.Value.GetRawText()));
+                additionalPropertiesDictionary.Add(property.Name, JsonSerializer.Deserialize<DataFactoryElement<string>>(property.Value.GetRawText()));
             }
             additionalProperties = additionalPropertiesDictionary;
             return new CosmosDBSqlApiSource(type, sourceRetryCount.Value, sourceRetryWait.Value, maxConcurrentConnections.Value, disableMetricsCollection.Value, additionalProperties, query.Value, pageSize.Value, preferredRegions.Value, detectDatetime.Value, additionalColumns.Value);
diff --git a/src/AzureDataFactory.TestingFramework/Generated/Models/CosmosDBSqlApiSource.cs b/src/AzureDataFactory.TestingFramework/Generated/Models/CosmosDBSqlApiSource.cs
index ee205caf..ddc9b2a6 100644
--- a/src/AzureDataFactory.TestingFramework/Generated/Models/CosmosDBSqlApiSource.cs
+++ b/src/AzureDataFactory.TestingFramework/Generated/Models/CosmosDBSqlApiSource.cs
@@ -30,7 +30,7 @@ public CosmosDBSqlApiSource()
         /// <param name="preferredRegions"> Preferred regions. Type: array of strings (or Expression with resultType array of strings). </param>
         /// <param name="detectDatetime"> Whether detect primitive values as datetime values. Type: boolean (or Expression with resultType boolean). </param>
         /// <param name="additionalColumns"> Specifies the additional columns to be added to source data. Type: array of objects(AdditionalColumns) (or Expression with resultType array of objects). </param>
-        internal CosmosDBSqlApiSource(string copySourceType, DataFactoryElement<int> sourceRetryCount, DataFactoryElement<string> sourceRetryWait, DataFactoryElement<int> maxConcurrentConnections, DataFactoryElement<bool> disableMetricsCollection, IDictionary<string, BinaryData> additionalProperties, DataFactoryElement<string> query, DataFactoryElement<int> pageSize, DataFactoryElement<IList<string>> preferredRegions, DataFactoryElement<bool> detectDatetime, BinaryData additionalColumns) : base(copySourceType, sourceRetryCount, sourceRetryWait, maxConcurrentConnections, disableMetricsCollection, additionalProperties)
+        internal CosmosDBSqlApiSource(string copySourceType, DataFactoryElement<int> sourceRetryCount, DataFactoryElement<string> sourceRetryWait, DataFactoryElement<int> maxConcurrentConnections, DataFactoryElement<bool> disableMetricsCollection, IDictionary<string, DataFactoryElement<string>> additionalProperties, DataFactoryElement<string> query, DataFactoryElement<int> pageSize, DataFactoryElement<IList<string>> preferredRegions, DataFactoryElement<bool> detectDatetime, BinaryData additionalColumns) : base(copySourceType, sourceRetryCount, sourceRetryWait, maxConcurrentConnections, disableMetricsCollection, additionalProperties)
         {
             Query = query;
             PageSize = pageSize;
diff --git a/src/AzureDataFactory.TestingFramework/Generated/Models/CouchbaseLinkedService.Serialization.cs b/src/AzureDataFactory.TestingFramework/Generated/Models/CouchbaseLinkedService.Serialization.cs
index 4dde5946..8b44da89 100644
--- a/src/AzureDataFactory.TestingFramework/Generated/Models/CouchbaseLinkedService.Serialization.cs
+++ b/src/AzureDataFactory.TestingFramework/Generated/Models/CouchbaseLinkedService.Serialization.cs
@@ -102,8 +102,8 @@ internal static CouchbaseLinkedService DeserializeCouchbaseLinkedService(JsonEle
             Optional<DataFactoryElement<string>> connectionString = default;
             Optional<DataFactoryKeyVaultSecretReference> credString = default;
             Optional<string> encryptedCredential = default;
-            IDictionary<string, BinaryData> additionalProperties = default;
-            Dictionary<string, BinaryData> additionalPropertiesDictionary = new Dictionary<string, BinaryData>();
+            IDictionary<string, DataFactoryElement<string>> additionalProperties = default;
+            Dictionary<string, DataFactoryElement<string>> additionalPropertiesDictionary = new Dictionary<string, DataFactoryElement<string>>();
             foreach (var property in element.EnumerateObject())
             {
                 if (property.NameEquals("type"u8))
@@ -195,7 +195,7 @@ internal static CouchbaseLinkedService DeserializeCouchbaseLinkedService(JsonEle
                     }
                     continue;
                 }
-                additionalPropertiesDictionary.Add(property.Name, BinaryData.FromString(property.Value.GetRawText()));
+                additionalPropertiesDictionary.Add(property.Name, JsonSerializer.Deserialize<DataFactoryElement<string>>(property.Value.GetRawText()));
             }
             additionalProperties = additionalPropertiesDictionary;
             return new CouchbaseLinkedService(type, connectVia.Value, description.Value, Optional.ToDictionary(parameters), Optional.ToList(annotations), additionalProperties, connectionString.Value, credString, encryptedCredential.Value);
diff --git a/src/AzureDataFactory.TestingFramework/Generated/Models/CouchbaseLinkedService.cs b/src/AzureDataFactory.TestingFramework/Generated/Models/CouchbaseLinkedService.cs
index b56c498d..e53163c6 100644
--- a/src/AzureDataFactory.TestingFramework/Generated/Models/CouchbaseLinkedService.cs
+++ b/src/AzureDataFactory.TestingFramework/Generated/Models/CouchbaseLinkedService.cs
@@ -28,7 +28,7 @@ public CouchbaseLinkedService()
         /// <param name="connectionString"> An ODBC connection string. Type: string, SecureString or AzureKeyVaultSecretReference. </param>
         /// <param name="credString"> The Azure key vault secret reference of credString in connection string. </param>
         /// <param name="encryptedCredential"> The encrypted credential used for authentication. Credentials are encrypted using the integration runtime credential manager. Type: string. </param>
-        internal CouchbaseLinkedService(string linkedServiceType, IntegrationRuntimeReference connectVia, string description, IDictionary<string, EntityParameterSpecification> parameters, IList<BinaryData> annotations, IDictionary<string, BinaryData> additionalProperties, DataFactoryElement<string> connectionString, DataFactoryKeyVaultSecretReference credString, string encryptedCredential) : base(linkedServiceType, connectVia, description, parameters, annotations, additionalProperties)
+        internal CouchbaseLinkedService(string linkedServiceType, IntegrationRuntimeReference connectVia, string description, IDictionary<string, EntityParameterSpecification> parameters, IList<BinaryData> annotations, IDictionary<string, DataFactoryElement<string>> additionalProperties, DataFactoryElement<string> connectionString, DataFactoryKeyVaultSecretReference credString, string encryptedCredential) : base(linkedServiceType, connectVia, description, parameters, annotations, additionalProperties)
         {
             ConnectionString = connectionString;
             CredString = credString;
diff --git a/src/AzureDataFactory.TestingFramework/Generated/Models/CouchbaseSource.Serialization.cs b/src/AzureDataFactory.TestingFramework/Generated/Models/CouchbaseSource.Serialization.cs
index fff70885..2c7f30dd 100644
--- a/src/AzureDataFactory.TestingFramework/Generated/Models/CouchbaseSource.Serialization.cs
+++ b/src/AzureDataFactory.TestingFramework/Generated/Models/CouchbaseSource.Serialization.cs
@@ -83,8 +83,8 @@ internal static CouchbaseSource DeserializeCouchbaseSource(JsonElement element)
             Optional<DataFactoryElement<string>> sourceRetryWait = default;
             Optional<DataFactoryElement<int>> maxConcurrentConnections = default;
             Optional<DataFactoryElement<bool>> disableMetricsCollection = default;
-            IDictionary<string, BinaryData> additionalProperties = default;
-            Dictionary<string, BinaryData> additionalPropertiesDictionary = new Dictionary<string, BinaryData>();
+            IDictionary<string, DataFactoryElement<string>> additionalProperties = default;
+            Dictionary<string, DataFactoryElement<string>> additionalPropertiesDictionary = new Dictionary<string, DataFactoryElement<string>>();
             foreach (var property in element.EnumerateObject())
             {
                 if (property.NameEquals("query"u8))
@@ -155,7 +155,7 @@ internal static CouchbaseSource DeserializeCouchbaseSource(JsonElement element)
                     disableMetricsCollection = JsonSerializer.Deserialize<DataFactoryElement<bool>>(property.Value.GetRawText());
                     continue;
                 }
-                additionalPropertiesDictionary.Add(property.Name, BinaryData.FromString(property.Value.GetRawText()));
+                additionalPropertiesDictionary.Add(property.Name, JsonSerializer.Deserialize<DataFactoryElement<string>>(property.Value.GetRawText()));
             }
             additionalProperties = additionalPropertiesDictionary;
             return new CouchbaseSource(type, sourceRetryCount.Value, sourceRetryWait.Value, maxConcurrentConnections.Value, disableMetricsCollection.Value, additionalProperties, queryTimeout.Value, additionalColumns.Value, query.Value);
diff --git a/src/AzureDataFactory.TestingFramework/Generated/Models/CouchbaseSource.cs b/src/AzureDataFactory.TestingFramework/Generated/Models/CouchbaseSource.cs
index 0f8d8ffb..c46ec074 100644
--- a/src/AzureDataFactory.TestingFramework/Generated/Models/CouchbaseSource.cs
+++ b/src/AzureDataFactory.TestingFramework/Generated/Models/CouchbaseSource.cs
@@ -28,7 +28,7 @@ public CouchbaseSource()
         /// <param name="queryTimeout"> Query timeout. Type: string (or Expression with resultType string), pattern: ((\d+)\.)?(\d\d):(60|([0-5][0-9])):(60|([0-5][0-9])). </param>
         /// <param name="additionalColumns"> Specifies the additional columns to be added to source data. Type: array of objects(AdditionalColumns) (or Expression with resultType array of objects). </param>
         /// <param name="query"> A query to retrieve data from source. Type: string (or Expression with resultType string). </param>
-        internal CouchbaseSource(string copySourceType, DataFactoryElement<int> sourceRetryCount, DataFactoryElement<string> sourceRetryWait, DataFactoryElement<int> maxConcurrentConnections, DataFactoryElement<bool> disableMetricsCollection, IDictionary<string, BinaryData> additionalProperties, DataFactoryElement<string> queryTimeout, BinaryData additionalColumns, DataFactoryElement<string> query) : base(copySourceType, sourceRetryCount, sourceRetryWait, maxConcurrentConnections, disableMetricsCollection, additionalProperties, queryTimeout, additionalColumns)
+        internal CouchbaseSource(string copySourceType, DataFactoryElement<int> sourceRetryCount, DataFactoryElement<string> sourceRetryWait, DataFactoryElement<int> maxConcurrentConnections, DataFactoryElement<bool> disableMetricsCollection, IDictionary<string, DataFactoryElement<string>> additionalProperties, DataFactoryElement<string> queryTimeout, BinaryData additionalColumns, DataFactoryElement<string> query) : base(copySourceType, sourceRetryCount, sourceRetryWait, maxConcurrentConnections, disableMetricsCollection, additionalProperties, queryTimeout, additionalColumns)
         {
             Query = query;
             CopySourceType = copySourceType ?? "CouchbaseSource";
diff --git a/src/AzureDataFactory.TestingFramework/Generated/Models/CouchbaseTableDataset.Serialization.cs b/src/AzureDataFactory.TestingFramework/Generated/Models/CouchbaseTableDataset.Serialization.cs
index 98cf8ff9..65cc924a 100644
--- a/src/AzureDataFactory.TestingFramework/Generated/Models/CouchbaseTableDataset.Serialization.cs
+++ b/src/AzureDataFactory.TestingFramework/Generated/Models/CouchbaseTableDataset.Serialization.cs
@@ -104,8 +104,8 @@ internal static CouchbaseTableDataset DeserializeCouchbaseTableDataset(JsonEleme
             Optional<IList<BinaryData>> annotations = default;
             Optional<DatasetFolder> folder = default;
             Optional<DataFactoryElement<string>> tableName = default;
-            IDictionary<string, BinaryData> additionalProperties = default;
-            Dictionary<string, BinaryData> additionalPropertiesDictionary = new Dictionary<string, BinaryData>();
+            IDictionary<string, DataFactoryElement<string>> additionalProperties = default;
+            Dictionary<string, DataFactoryElement<string>> additionalPropertiesDictionary = new Dictionary<string, DataFactoryElement<string>>();
             foreach (var property in element.EnumerateObject())
             {
                 if (property.NameEquals("type"u8))
@@ -206,7 +206,7 @@ internal static CouchbaseTableDataset DeserializeCouchbaseTableDataset(JsonEleme
                     }
                     continue;
                 }
-                additionalPropertiesDictionary.Add(property.Name, BinaryData.FromString(property.Value.GetRawText()));
+                additionalPropertiesDictionary.Add(property.Name, JsonSerializer.Deserialize<DataFactoryElement<string>>(property.Value.GetRawText()));
             }
             additionalProperties = additionalPropertiesDictionary;
             return new CouchbaseTableDataset(type, description.Value, structure.Value, schema.Value, linkedServiceName, Optional.ToDictionary(parameters), Optional.ToList(annotations), folder.Value, additionalProperties, tableName.Value);
diff --git a/src/AzureDataFactory.TestingFramework/Generated/Models/CouchbaseTableDataset.cs b/src/AzureDataFactory.TestingFramework/Generated/Models/CouchbaseTableDataset.cs
index 16d26f50..132ab507 100644
--- a/src/AzureDataFactory.TestingFramework/Generated/Models/CouchbaseTableDataset.cs
+++ b/src/AzureDataFactory.TestingFramework/Generated/Models/CouchbaseTableDataset.cs
@@ -34,7 +34,7 @@ public CouchbaseTableDataset(DataFactoryLinkedServiceReference linkedServiceName
         /// <param name="folder"> The folder that this Dataset is in. If not specified, Dataset will appear at the root level. </param>
         /// <param name="additionalProperties"> Additional Properties. </param>
         /// <param name="tableName"> The table name. Type: string (or Expression with resultType string). </param>
-        internal CouchbaseTableDataset(string datasetType, string description, DataFactoryElement<IList<DatasetDataElement>> structure, DataFactoryElement<IList<DatasetSchemaDataElement>> schema, DataFactoryLinkedServiceReference linkedServiceName, IDictionary<string, EntityParameterSpecification> parameters, IList<BinaryData> annotations, DatasetFolder folder, IDictionary<string, BinaryData> additionalProperties, DataFactoryElement<string> tableName) : base(datasetType, description, structure, schema, linkedServiceName, parameters, annotations, folder, additionalProperties)
+        internal CouchbaseTableDataset(string datasetType, string description, DataFactoryElement<IList<DatasetDataElement>> structure, DataFactoryElement<IList<DatasetSchemaDataElement>> schema, DataFactoryLinkedServiceReference linkedServiceName, IDictionary<string, EntityParameterSpecification> parameters, IList<BinaryData> annotations, DatasetFolder folder, IDictionary<string, DataFactoryElement<string>> additionalProperties, DataFactoryElement<string> tableName) : base(datasetType, description, structure, schema, linkedServiceName, parameters, annotations, folder, additionalProperties)
         {
             TableName = tableName;
             DatasetType = datasetType ?? "CouchbaseTable";
diff --git a/src/AzureDataFactory.TestingFramework/Generated/Models/CustomActivity.Serialization.cs b/src/AzureDataFactory.TestingFramework/Generated/Models/CustomActivity.Serialization.cs
index 4d9fb469..fa568744 100644
--- a/src/AzureDataFactory.TestingFramework/Generated/Models/CustomActivity.Serialization.cs
+++ b/src/AzureDataFactory.TestingFramework/Generated/Models/CustomActivity.Serialization.cs
@@ -150,11 +150,11 @@ internal static CustomActivity DeserializeCustomActivity(JsonElement element)
             Optional<DataFactoryLinkedServiceReference> resourceLinkedService = default;
             Optional<DataFactoryElement<string>> folderPath = default;
             Optional<CustomActivityReferenceObject> referenceObjects = default;
-            Optional<IDictionary<string, BinaryData>> extendedProperties = default;
+            Optional<IDictionary<string, DataFactoryElement<string>>> extendedProperties = default;
             Optional<BinaryData> retentionTimeInDays = default;
             Optional<DataFactoryElement<string>> autoUserSpecification = default;
-            IDictionary<string, BinaryData> additionalProperties = default;
-            Dictionary<string, BinaryData> additionalPropertiesDictionary = new Dictionary<string, BinaryData>();
+            IDictionary<string, DataFactoryElement<string>> additionalProperties = default;
+            Dictionary<string, DataFactoryElement<string>> additionalPropertiesDictionary = new Dictionary<string, DataFactoryElement<string>>();
             foreach (var property in element.EnumerateObject())
             {
                 if (property.NameEquals("linkedServiceName"u8))
@@ -283,7 +283,7 @@ internal static CustomActivity DeserializeCustomActivity(JsonElement element)
                             {
                                 continue;
                             }
-                            Dictionary<string, BinaryData> dictionary = new Dictionary<string, BinaryData>();
+                            Dictionary<string, DataFactoryElement<string>> dictionary = new Dictionary<string, DataFactoryElement<string>>();
                             foreach (var property1 in property0.Value.EnumerateObject())
                             {
                                 if (property1.Value.ValueKind == JsonValueKind.Null)
@@ -292,7 +292,7 @@ internal static CustomActivity DeserializeCustomActivity(JsonElement element)
                                 }
                                 else
                                 {
-                                    dictionary.Add(property1.Name, BinaryData.FromString(property1.Value.GetRawText()));
+                                    dictionary.Add(property1.Name, JsonSerializer.Deserialize<DataFactoryElement<string>>(property1.Value.GetRawText()));
                                 }
                             }
                             extendedProperties = dictionary;
@@ -319,7 +319,7 @@ internal static CustomActivity DeserializeCustomActivity(JsonElement element)
                     }
                     continue;
                 }
-                additionalPropertiesDictionary.Add(property.Name, BinaryData.FromString(property.Value.GetRawText()));
+                additionalPropertiesDictionary.Add(property.Name, JsonSerializer.Deserialize<DataFactoryElement<string>>(property.Value.GetRawText()));
             }
             additionalProperties = additionalPropertiesDictionary;
             return new CustomActivity(name, type, description.Value, Optional.ToNullable(state), Optional.ToNullable(onInactiveMarkAs), Optional.ToList(dependsOn), Optional.ToList(userProperties), additionalProperties, linkedServiceName, policy.Value, command, resourceLinkedService, folderPath.Value, referenceObjects.Value, Optional.ToDictionary(extendedProperties), retentionTimeInDays.Value, autoUserSpecification.Value);
diff --git a/src/AzureDataFactory.TestingFramework/Generated/Models/CustomActivity.cs b/src/AzureDataFactory.TestingFramework/Generated/Models/CustomActivity.cs
index 8d127707..421793e8 100644
--- a/src/AzureDataFactory.TestingFramework/Generated/Models/CustomActivity.cs
+++ b/src/AzureDataFactory.TestingFramework/Generated/Models/CustomActivity.cs
@@ -23,7 +23,7 @@ public CustomActivity(string name, DataFactoryElement<string> command) : base(na
             Argument.AssertNotNull(command, nameof(command));
 
             Command = command;
-            ExtendedProperties = new ChangeTrackingDictionary<string, BinaryData>();
+            ExtendedProperties = new ChangeTrackingDictionary<string, DataFactoryElement<string>>();
             ActivityType = "Custom";
         }
 
@@ -45,7 +45,7 @@ public CustomActivity(string name, DataFactoryElement<string> command) : base(na
         /// <param name="extendedProperties"> User defined property bag. There is no restriction on the keys or values that can be used. The user specified custom activity has the full responsibility to consume and interpret the content defined. </param>
         /// <param name="retentionTimeInDays"> The retention time for the files submitted for custom activity. Type: double (or Expression with resultType double). </param>
         /// <param name="autoUserSpecification"> Elevation level and scope for the user, default is nonadmin task. Type: string (or Expression with resultType double). </param>
-        internal CustomActivity(string name, string activityType, string description, PipelineActivityState? state, ActivityOnInactiveMarkAs? onInactiveMarkAs, IList<PipelineActivityDependency> dependsOn, IList<PipelineActivityUserProperty> userProperties, IDictionary<string, BinaryData> additionalProperties, DataFactoryLinkedServiceReference linkedServiceName, PipelineActivityPolicy policy, DataFactoryElement<string> command, DataFactoryLinkedServiceReference resourceLinkedService, DataFactoryElement<string> folderPath, CustomActivityReferenceObject referenceObjects, IDictionary<string, BinaryData> extendedProperties, BinaryData retentionTimeInDays, DataFactoryElement<string> autoUserSpecification) : base(name, activityType, description, state, onInactiveMarkAs, dependsOn, userProperties, additionalProperties, linkedServiceName, policy)
+        internal CustomActivity(string name, string activityType, string description, PipelineActivityState? state, ActivityOnInactiveMarkAs? onInactiveMarkAs, IList<PipelineActivityDependency> dependsOn, IList<PipelineActivityUserProperty> userProperties, IDictionary<string, DataFactoryElement<string>> additionalProperties, DataFactoryLinkedServiceReference linkedServiceName, PipelineActivityPolicy policy, DataFactoryElement<string> command, DataFactoryLinkedServiceReference resourceLinkedService, DataFactoryElement<string> folderPath, CustomActivityReferenceObject referenceObjects, IDictionary<string, DataFactoryElement<string>> extendedProperties, BinaryData retentionTimeInDays, DataFactoryElement<string> autoUserSpecification) : base(name, activityType, description, state, onInactiveMarkAs, dependsOn, userProperties, additionalProperties, linkedServiceName, policy)
         {
             Command = command;
             ResourceLinkedService = resourceLinkedService;
@@ -95,7 +95,7 @@ internal CustomActivity(string name, string activityType, string description, Pi
         /// </list>
         /// </para>
         /// </summary>
-        public IDictionary<string, BinaryData> ExtendedProperties { get; }
+        public IDictionary<string, DataFactoryElement<string>> ExtendedProperties { get; }
         /// <summary>
         /// The retention time for the files submitted for custom activity. Type: double (or Expression with resultType double).
         /// <para>
diff --git a/src/AzureDataFactory.TestingFramework/Generated/Models/CustomDataSourceLinkedService.Serialization.cs b/src/AzureDataFactory.TestingFramework/Generated/Models/CustomDataSourceLinkedService.Serialization.cs
index 5212899b..38526c27 100644
--- a/src/AzureDataFactory.TestingFramework/Generated/Models/CustomDataSourceLinkedService.Serialization.cs
+++ b/src/AzureDataFactory.TestingFramework/Generated/Models/CustomDataSourceLinkedService.Serialization.cs
@@ -7,6 +7,7 @@
 
 using System.Text.Json;
 using Azure.Core;
+using Azure.Core.Expressions.DataFactory;
 
 namespace AzureDataFactory.TestingFramework.Models
 {
@@ -87,8 +88,8 @@ internal static CustomDataSourceLinkedService DeserializeCustomDataSourceLinkedS
             Optional<string> description = default;
             Optional<IDictionary<string, EntityParameterSpecification>> parameters = default;
             Optional<IList<BinaryData>> annotations = default;
-            IDictionary<string, BinaryData> additionalProperties = default;
-            Dictionary<string, BinaryData> additionalPropertiesDictionary = new Dictionary<string, BinaryData>();
+            IDictionary<string, DataFactoryElement<string>> additionalProperties = default;
+            Dictionary<string, DataFactoryElement<string>> additionalPropertiesDictionary = new Dictionary<string, DataFactoryElement<string>>();
             foreach (var property in element.EnumerateObject())
             {
                 if (property.NameEquals("typeProperties"u8))
@@ -150,7 +151,7 @@ internal static CustomDataSourceLinkedService DeserializeCustomDataSourceLinkedS
                     annotations = array;
                     continue;
                 }
-                additionalPropertiesDictionary.Add(property.Name, BinaryData.FromString(property.Value.GetRawText()));
+                additionalPropertiesDictionary.Add(property.Name, JsonSerializer.Deserialize<DataFactoryElement<string>>(property.Value.GetRawText()));
             }
             additionalProperties = additionalPropertiesDictionary;
             return new CustomDataSourceLinkedService(type, connectVia.Value, description.Value, Optional.ToDictionary(parameters), Optional.ToList(annotations), additionalProperties, typeProperties);
diff --git a/src/AzureDataFactory.TestingFramework/Generated/Models/CustomDataSourceLinkedService.cs b/src/AzureDataFactory.TestingFramework/Generated/Models/CustomDataSourceLinkedService.cs
index 3886844c..30320f79 100644
--- a/src/AzureDataFactory.TestingFramework/Generated/Models/CustomDataSourceLinkedService.cs
+++ b/src/AzureDataFactory.TestingFramework/Generated/Models/CustomDataSourceLinkedService.cs
@@ -6,6 +6,7 @@
 #nullable disable
 
 using Azure.Core;
+using Azure.Core.Expressions.DataFactory;
 
 namespace AzureDataFactory.TestingFramework.Models
 {
@@ -31,7 +32,7 @@ public CustomDataSourceLinkedService(BinaryData typeProperties)
         /// <param name="annotations"> List of tags that can be used for describing the linked service. </param>
         /// <param name="additionalProperties"> Additional Properties. </param>
         /// <param name="typeProperties"> Custom linked service properties. </param>
-        internal CustomDataSourceLinkedService(string linkedServiceType, IntegrationRuntimeReference connectVia, string description, IDictionary<string, EntityParameterSpecification> parameters, IList<BinaryData> annotations, IDictionary<string, BinaryData> additionalProperties, BinaryData typeProperties) : base(linkedServiceType, connectVia, description, parameters, annotations, additionalProperties)
+        internal CustomDataSourceLinkedService(string linkedServiceType, IntegrationRuntimeReference connectVia, string description, IDictionary<string, EntityParameterSpecification> parameters, IList<BinaryData> annotations, IDictionary<string, DataFactoryElement<string>> additionalProperties, BinaryData typeProperties) : base(linkedServiceType, connectVia, description, parameters, annotations, additionalProperties)
         {
             TypeProperties = typeProperties;
             LinkedServiceType = linkedServiceType ?? "CustomDataSource";
diff --git a/src/AzureDataFactory.TestingFramework/Generated/Models/CustomDataset.Serialization.cs b/src/AzureDataFactory.TestingFramework/Generated/Models/CustomDataset.Serialization.cs
index 7f541701..a78dafef 100644
--- a/src/AzureDataFactory.TestingFramework/Generated/Models/CustomDataset.Serialization.cs
+++ b/src/AzureDataFactory.TestingFramework/Generated/Models/CustomDataset.Serialization.cs
@@ -105,8 +105,8 @@ internal static CustomDataset DeserializeCustomDataset(JsonElement element)
             Optional<IDictionary<string, EntityParameterSpecification>> parameters = default;
             Optional<IList<BinaryData>> annotations = default;
             Optional<DatasetFolder> folder = default;
-            IDictionary<string, BinaryData> additionalProperties = default;
-            Dictionary<string, BinaryData> additionalPropertiesDictionary = new Dictionary<string, BinaryData>();
+            IDictionary<string, DataFactoryElement<string>> additionalProperties = default;
+            Dictionary<string, DataFactoryElement<string>> additionalPropertiesDictionary = new Dictionary<string, DataFactoryElement<string>>();
             foreach (var property in element.EnumerateObject())
             {
                 if (property.NameEquals("typeProperties"u8))
@@ -195,7 +195,7 @@ internal static CustomDataset DeserializeCustomDataset(JsonElement element)
                     folder = DatasetFolder.DeserializeDatasetFolder(property.Value);
                     continue;
                 }
-                additionalPropertiesDictionary.Add(property.Name, BinaryData.FromString(property.Value.GetRawText()));
+                additionalPropertiesDictionary.Add(property.Name, JsonSerializer.Deserialize<DataFactoryElement<string>>(property.Value.GetRawText()));
             }
             additionalProperties = additionalPropertiesDictionary;
             return new CustomDataset(type, description.Value, structure.Value, schema.Value, linkedServiceName, Optional.ToDictionary(parameters), Optional.ToList(annotations), folder.Value, additionalProperties, typeProperties.Value);
diff --git a/src/AzureDataFactory.TestingFramework/Generated/Models/CustomDataset.cs b/src/AzureDataFactory.TestingFramework/Generated/Models/CustomDataset.cs
index d02aed17..017f2b04 100644
--- a/src/AzureDataFactory.TestingFramework/Generated/Models/CustomDataset.cs
+++ b/src/AzureDataFactory.TestingFramework/Generated/Models/CustomDataset.cs
@@ -34,7 +34,7 @@ public CustomDataset(DataFactoryLinkedServiceReference linkedServiceName) : base
         /// <param name="folder"> The folder that this Dataset is in. If not specified, Dataset will appear at the root level. </param>
         /// <param name="additionalProperties"> Additional Properties. </param>
         /// <param name="typeProperties"> Custom dataset properties. </param>
-        internal CustomDataset(string datasetType, string description, DataFactoryElement<IList<DatasetDataElement>> structure, DataFactoryElement<IList<DatasetSchemaDataElement>> schema, DataFactoryLinkedServiceReference linkedServiceName, IDictionary<string, EntityParameterSpecification> parameters, IList<BinaryData> annotations, DatasetFolder folder, IDictionary<string, BinaryData> additionalProperties, BinaryData typeProperties) : base(datasetType, description, structure, schema, linkedServiceName, parameters, annotations, folder, additionalProperties)
+        internal CustomDataset(string datasetType, string description, DataFactoryElement<IList<DatasetDataElement>> structure, DataFactoryElement<IList<DatasetSchemaDataElement>> schema, DataFactoryLinkedServiceReference linkedServiceName, IDictionary<string, EntityParameterSpecification> parameters, IList<BinaryData> annotations, DatasetFolder folder, IDictionary<string, DataFactoryElement<string>> additionalProperties, BinaryData typeProperties) : base(datasetType, description, structure, schema, linkedServiceName, parameters, annotations, folder, additionalProperties)
         {
             TypeProperties = typeProperties;
             DatasetType = datasetType ?? "CustomDataset";
diff --git a/src/AzureDataFactory.TestingFramework/Generated/Models/CustomEventsTrigger.Serialization.cs b/src/AzureDataFactory.TestingFramework/Generated/Models/CustomEventsTrigger.Serialization.cs
index a008e368..1f6c5de6 100644
--- a/src/AzureDataFactory.TestingFramework/Generated/Models/CustomEventsTrigger.Serialization.cs
+++ b/src/AzureDataFactory.TestingFramework/Generated/Models/CustomEventsTrigger.Serialization.cs
@@ -7,6 +7,7 @@
 
 using System.Text.Json;
 using Azure.Core;
+using Azure.Core.Expressions.DataFactory;
 
 namespace AzureDataFactory.TestingFramework.Models
 {
@@ -109,8 +110,8 @@ internal static CustomEventsTrigger DeserializeCustomEventsTrigger(JsonElement e
             Optional<string> subjectEndsWith = default;
             IList<BinaryData> events = default;
             string scope = default;
-            IDictionary<string, BinaryData> additionalProperties = default;
-            Dictionary<string, BinaryData> additionalPropertiesDictionary = new Dictionary<string, BinaryData>();
+            IDictionary<string, DataFactoryElement<string>> additionalProperties = default;
+            Dictionary<string, DataFactoryElement<string>> additionalPropertiesDictionary = new Dictionary<string, DataFactoryElement<string>>();
             foreach (var property in element.EnumerateObject())
             {
                 if (property.NameEquals("pipelines"u8))
@@ -211,7 +212,7 @@ internal static CustomEventsTrigger DeserializeCustomEventsTrigger(JsonElement e
                     }
                     continue;
                 }
-                additionalPropertiesDictionary.Add(property.Name, BinaryData.FromString(property.Value.GetRawText()));
+                additionalPropertiesDictionary.Add(property.Name, JsonSerializer.Deserialize<DataFactoryElement<string>>(property.Value.GetRawText()));
             }
             additionalProperties = additionalPropertiesDictionary;
             return new CustomEventsTrigger(type, description.Value, Optional.ToNullable(runtimeState), Optional.ToList(annotations), additionalProperties, Optional.ToList(pipelines), subjectBeginsWith.Value, subjectEndsWith.Value, events, scope);
diff --git a/src/AzureDataFactory.TestingFramework/Generated/Models/CustomEventsTrigger.cs b/src/AzureDataFactory.TestingFramework/Generated/Models/CustomEventsTrigger.cs
index 00ab4e43..462a88e1 100644
--- a/src/AzureDataFactory.TestingFramework/Generated/Models/CustomEventsTrigger.cs
+++ b/src/AzureDataFactory.TestingFramework/Generated/Models/CustomEventsTrigger.cs
@@ -6,6 +6,7 @@
 #nullable disable
 
 using Azure.Core;
+using Azure.Core.Expressions.DataFactory;
 
 namespace AzureDataFactory.TestingFramework.Models
 {
@@ -37,7 +38,7 @@ public CustomEventsTrigger(IEnumerable<BinaryData> events, string scope)
         /// <param name="subjectEndsWith"> The event subject must end with the pattern provided for trigger to fire. At least one of these must be provided: subjectBeginsWith, subjectEndsWith. </param>
         /// <param name="events"> The list of event types that cause this trigger to fire. </param>
         /// <param name="scope"> The ARM resource ID of the Azure Event Grid Topic. </param>
-        internal CustomEventsTrigger(string triggerType, string description, DataFactoryTriggerRuntimeState? runtimeState, IList<BinaryData> annotations, IDictionary<string, BinaryData> additionalProperties, IList<TriggerPipelineReference> pipelines, string subjectBeginsWith, string subjectEndsWith, IList<BinaryData> events, string scope) : base(triggerType, description, runtimeState, annotations, additionalProperties, pipelines)
+        internal CustomEventsTrigger(string triggerType, string description, DataFactoryTriggerRuntimeState? runtimeState, IList<BinaryData> annotations, IDictionary<string, DataFactoryElement<string>> additionalProperties, IList<TriggerPipelineReference> pipelines, string subjectBeginsWith, string subjectEndsWith, IList<BinaryData> events, string scope) : base(triggerType, description, runtimeState, annotations, additionalProperties, pipelines)
         {
             SubjectBeginsWith = subjectBeginsWith;
             SubjectEndsWith = subjectEndsWith;
diff --git a/src/AzureDataFactory.TestingFramework/Generated/Models/DataFactoryBlobEventsTrigger.Serialization.cs b/src/AzureDataFactory.TestingFramework/Generated/Models/DataFactoryBlobEventsTrigger.Serialization.cs
index 3ebcedaf..a085824d 100644
--- a/src/AzureDataFactory.TestingFramework/Generated/Models/DataFactoryBlobEventsTrigger.Serialization.cs
+++ b/src/AzureDataFactory.TestingFramework/Generated/Models/DataFactoryBlobEventsTrigger.Serialization.cs
@@ -7,6 +7,7 @@
 
 using System.Text.Json;
 using Azure.Core;
+using Azure.Core.Expressions.DataFactory;
 
 namespace AzureDataFactory.TestingFramework.Models
 {
@@ -106,8 +107,8 @@ internal static DataFactoryBlobEventsTrigger DeserializeDataFactoryBlobEventsTri
             Optional<bool> ignoreEmptyBlobs = default;
             IList<DataFactoryBlobEventType> events = default;
             string scope = default;
-            IDictionary<string, BinaryData> additionalProperties = default;
-            Dictionary<string, BinaryData> additionalPropertiesDictionary = new Dictionary<string, BinaryData>();
+            IDictionary<string, DataFactoryElement<string>> additionalProperties = default;
+            Dictionary<string, DataFactoryElement<string>> additionalPropertiesDictionary = new Dictionary<string, DataFactoryElement<string>>();
             foreach (var property in element.EnumerateObject())
             {
                 if (property.NameEquals("pipelines"u8))
@@ -210,7 +211,7 @@ internal static DataFactoryBlobEventsTrigger DeserializeDataFactoryBlobEventsTri
                     }
                     continue;
                 }
-                additionalPropertiesDictionary.Add(property.Name, BinaryData.FromString(property.Value.GetRawText()));
+                additionalPropertiesDictionary.Add(property.Name, JsonSerializer.Deserialize<DataFactoryElement<string>>(property.Value.GetRawText()));
             }
             additionalProperties = additionalPropertiesDictionary;
             return new DataFactoryBlobEventsTrigger(type, description.Value, Optional.ToNullable(runtimeState), Optional.ToList(annotations), additionalProperties, Optional.ToList(pipelines), blobPathBeginsWith.Value, blobPathEndsWith.Value, Optional.ToNullable(ignoreEmptyBlobs), events, scope);
diff --git a/src/AzureDataFactory.TestingFramework/Generated/Models/DataFactoryBlobEventsTrigger.cs b/src/AzureDataFactory.TestingFramework/Generated/Models/DataFactoryBlobEventsTrigger.cs
index f0e93ac7..130c30ba 100644
--- a/src/AzureDataFactory.TestingFramework/Generated/Models/DataFactoryBlobEventsTrigger.cs
+++ b/src/AzureDataFactory.TestingFramework/Generated/Models/DataFactoryBlobEventsTrigger.cs
@@ -6,6 +6,7 @@
 #nullable disable
 
 using Azure.Core;
+using Azure.Core.Expressions.DataFactory;
 
 namespace AzureDataFactory.TestingFramework.Models
 {
@@ -38,7 +39,7 @@ public DataFactoryBlobEventsTrigger(IEnumerable<DataFactoryBlobEventType> events
         /// <param name="ignoreEmptyBlobs"> If set to true, blobs with zero bytes will be ignored. </param>
         /// <param name="events"> The type of events that cause this trigger to fire. </param>
         /// <param name="scope"> The ARM resource ID of the Storage Account. </param>
-        internal DataFactoryBlobEventsTrigger(string triggerType, string description, DataFactoryTriggerRuntimeState? runtimeState, IList<BinaryData> annotations, IDictionary<string, BinaryData> additionalProperties, IList<TriggerPipelineReference> pipelines, string blobPathBeginsWith, string blobPathEndsWith, bool? ignoreEmptyBlobs, IList<DataFactoryBlobEventType> events, string scope) : base(triggerType, description, runtimeState, annotations, additionalProperties, pipelines)
+        internal DataFactoryBlobEventsTrigger(string triggerType, string description, DataFactoryTriggerRuntimeState? runtimeState, IList<BinaryData> annotations, IDictionary<string, DataFactoryElement<string>> additionalProperties, IList<TriggerPipelineReference> pipelines, string blobPathBeginsWith, string blobPathEndsWith, bool? ignoreEmptyBlobs, IList<DataFactoryBlobEventType> events, string scope) : base(triggerType, description, runtimeState, annotations, additionalProperties, pipelines)
         {
             BlobPathBeginsWith = blobPathBeginsWith;
             BlobPathEndsWith = blobPathEndsWith;
diff --git a/src/AzureDataFactory.TestingFramework/Generated/Models/DataFactoryBlobSink.Serialization.cs b/src/AzureDataFactory.TestingFramework/Generated/Models/DataFactoryBlobSink.Serialization.cs
index 96356b82..f538fad9 100644
--- a/src/AzureDataFactory.TestingFramework/Generated/Models/DataFactoryBlobSink.Serialization.cs
+++ b/src/AzureDataFactory.TestingFramework/Generated/Models/DataFactoryBlobSink.Serialization.cs
@@ -112,8 +112,8 @@ internal static DataFactoryBlobSink DeserializeDataFactoryBlobSink(JsonElement e
             Optional<DataFactoryElement<string>> sinkRetryWait = default;
             Optional<DataFactoryElement<int>> maxConcurrentConnections = default;
             Optional<DataFactoryElement<bool>> disableMetricsCollection = default;
-            IDictionary<string, BinaryData> additionalProperties = default;
-            Dictionary<string, BinaryData> additionalPropertiesDictionary = new Dictionary<string, BinaryData>();
+            IDictionary<string, DataFactoryElement<string>> additionalProperties = default;
+            Dictionary<string, DataFactoryElement<string>> additionalPropertiesDictionary = new Dictionary<string, DataFactoryElement<string>>();
             foreach (var property in element.EnumerateObject())
             {
                 if (property.NameEquals("blobWriterOverwriteFiles"u8))
@@ -225,7 +225,7 @@ internal static DataFactoryBlobSink DeserializeDataFactoryBlobSink(JsonElement e
                     disableMetricsCollection = JsonSerializer.Deserialize<DataFactoryElement<bool>>(property.Value.GetRawText());
                     continue;
                 }
-                additionalPropertiesDictionary.Add(property.Name, BinaryData.FromString(property.Value.GetRawText()));
+                additionalPropertiesDictionary.Add(property.Name, JsonSerializer.Deserialize<DataFactoryElement<string>>(property.Value.GetRawText()));
             }
             additionalProperties = additionalPropertiesDictionary;
             return new DataFactoryBlobSink(type, writeBatchSize.Value, writeBatchTimeout.Value, sinkRetryCount.Value, sinkRetryWait.Value, maxConcurrentConnections.Value, disableMetricsCollection.Value, additionalProperties, blobWriterOverwriteFiles.Value, blobWriterDateTimeFormat.Value, blobWriterAddHeader.Value, copyBehavior.Value, Optional.ToList(metadata));
diff --git a/src/AzureDataFactory.TestingFramework/Generated/Models/DataFactoryBlobSink.cs b/src/AzureDataFactory.TestingFramework/Generated/Models/DataFactoryBlobSink.cs
index d29553c0..03a10ced 100644
--- a/src/AzureDataFactory.TestingFramework/Generated/Models/DataFactoryBlobSink.cs
+++ b/src/AzureDataFactory.TestingFramework/Generated/Models/DataFactoryBlobSink.cs
@@ -34,7 +34,7 @@ public DataFactoryBlobSink()
         /// <param name="blobWriterAddHeader"> Blob writer add header. Type: boolean (or Expression with resultType boolean). </param>
         /// <param name="copyBehavior"> The type of copy behavior for copy sink. </param>
         /// <param name="metadata"> Specify the custom metadata to be added to sink data. Type: array of objects (or Expression with resultType array of objects). </param>
-        internal DataFactoryBlobSink(string copySinkType, DataFactoryElement<int> writeBatchSize, DataFactoryElement<string> writeBatchTimeout, DataFactoryElement<int> sinkRetryCount, DataFactoryElement<string> sinkRetryWait, DataFactoryElement<int> maxConcurrentConnections, DataFactoryElement<bool> disableMetricsCollection, IDictionary<string, BinaryData> additionalProperties, DataFactoryElement<bool> blobWriterOverwriteFiles, DataFactoryElement<string> blobWriterDateTimeFormat, DataFactoryElement<bool> blobWriterAddHeader, BinaryData copyBehavior, IList<DataFactoryMetadataItemInfo> metadata) : base(copySinkType, writeBatchSize, writeBatchTimeout, sinkRetryCount, sinkRetryWait, maxConcurrentConnections, disableMetricsCollection, additionalProperties)
+        internal DataFactoryBlobSink(string copySinkType, DataFactoryElement<int> writeBatchSize, DataFactoryElement<string> writeBatchTimeout, DataFactoryElement<int> sinkRetryCount, DataFactoryElement<string> sinkRetryWait, DataFactoryElement<int> maxConcurrentConnections, DataFactoryElement<bool> disableMetricsCollection, IDictionary<string, DataFactoryElement<string>> additionalProperties, DataFactoryElement<bool> blobWriterOverwriteFiles, DataFactoryElement<string> blobWriterDateTimeFormat, DataFactoryElement<bool> blobWriterAddHeader, BinaryData copyBehavior, IList<DataFactoryMetadataItemInfo> metadata) : base(copySinkType, writeBatchSize, writeBatchTimeout, sinkRetryCount, sinkRetryWait, maxConcurrentConnections, disableMetricsCollection, additionalProperties)
         {
             BlobWriterOverwriteFiles = blobWriterOverwriteFiles;
             BlobWriterDateTimeFormat = blobWriterDateTimeFormat;
diff --git a/src/AzureDataFactory.TestingFramework/Generated/Models/DataFactoryBlobSource.Serialization.cs b/src/AzureDataFactory.TestingFramework/Generated/Models/DataFactoryBlobSource.Serialization.cs
index e50fd1a4..59b65dd1 100644
--- a/src/AzureDataFactory.TestingFramework/Generated/Models/DataFactoryBlobSource.Serialization.cs
+++ b/src/AzureDataFactory.TestingFramework/Generated/Models/DataFactoryBlobSource.Serialization.cs
@@ -79,8 +79,8 @@ internal static DataFactoryBlobSource DeserializeDataFactoryBlobSource(JsonEleme
             Optional<DataFactoryElement<string>> sourceRetryWait = default;
             Optional<DataFactoryElement<int>> maxConcurrentConnections = default;
             Optional<DataFactoryElement<bool>> disableMetricsCollection = default;
-            IDictionary<string, BinaryData> additionalProperties = default;
-            Dictionary<string, BinaryData> additionalPropertiesDictionary = new Dictionary<string, BinaryData>();
+            IDictionary<string, DataFactoryElement<string>> additionalProperties = default;
+            Dictionary<string, DataFactoryElement<string>> additionalPropertiesDictionary = new Dictionary<string, DataFactoryElement<string>>();
             foreach (var property in element.EnumerateObject())
             {
                 if (property.NameEquals("treatEmptyAsNull"u8))
@@ -151,7 +151,7 @@ internal static DataFactoryBlobSource DeserializeDataFactoryBlobSource(JsonEleme
                     disableMetricsCollection = JsonSerializer.Deserialize<DataFactoryElement<bool>>(property.Value.GetRawText());
                     continue;
                 }
-                additionalPropertiesDictionary.Add(property.Name, BinaryData.FromString(property.Value.GetRawText()));
+                additionalPropertiesDictionary.Add(property.Name, JsonSerializer.Deserialize<DataFactoryElement<string>>(property.Value.GetRawText()));
             }
             additionalProperties = additionalPropertiesDictionary;
             return new DataFactoryBlobSource(type, sourceRetryCount.Value, sourceRetryWait.Value, maxConcurrentConnections.Value, disableMetricsCollection.Value, additionalProperties, treatEmptyAsNull.Value, skipHeaderLineCount.Value, recursive.Value);
diff --git a/src/AzureDataFactory.TestingFramework/Generated/Models/DataFactoryBlobSource.cs b/src/AzureDataFactory.TestingFramework/Generated/Models/DataFactoryBlobSource.cs
index f256bbf3..090d0d3b 100644
--- a/src/AzureDataFactory.TestingFramework/Generated/Models/DataFactoryBlobSource.cs
+++ b/src/AzureDataFactory.TestingFramework/Generated/Models/DataFactoryBlobSource.cs
@@ -28,7 +28,7 @@ public DataFactoryBlobSource()
         /// <param name="treatEmptyAsNull"> Treat empty as null. Type: boolean (or Expression with resultType boolean). </param>
         /// <param name="skipHeaderLineCount"> Number of header lines to skip from each blob. Type: integer (or Expression with resultType integer). </param>
         /// <param name="recursive"> If true, files under the folder path will be read recursively. Default is true. Type: boolean (or Expression with resultType boolean). </param>
-        internal DataFactoryBlobSource(string copySourceType, DataFactoryElement<int> sourceRetryCount, DataFactoryElement<string> sourceRetryWait, DataFactoryElement<int> maxConcurrentConnections, DataFactoryElement<bool> disableMetricsCollection, IDictionary<string, BinaryData> additionalProperties, DataFactoryElement<bool> treatEmptyAsNull, DataFactoryElement<int> skipHeaderLineCount, DataFactoryElement<bool> recursive) : base(copySourceType, sourceRetryCount, sourceRetryWait, maxConcurrentConnections, disableMetricsCollection, additionalProperties)
+        internal DataFactoryBlobSource(string copySourceType, DataFactoryElement<int> sourceRetryCount, DataFactoryElement<string> sourceRetryWait, DataFactoryElement<int> maxConcurrentConnections, DataFactoryElement<bool> disableMetricsCollection, IDictionary<string, DataFactoryElement<string>> additionalProperties, DataFactoryElement<bool> treatEmptyAsNull, DataFactoryElement<int> skipHeaderLineCount, DataFactoryElement<bool> recursive) : base(copySourceType, sourceRetryCount, sourceRetryWait, maxConcurrentConnections, disableMetricsCollection, additionalProperties)
         {
             TreatEmptyAsNull = treatEmptyAsNull;
             SkipHeaderLineCount = skipHeaderLineCount;
diff --git a/src/AzureDataFactory.TestingFramework/Generated/Models/DataFactoryBlobTrigger.Serialization.cs b/src/AzureDataFactory.TestingFramework/Generated/Models/DataFactoryBlobTrigger.Serialization.cs
index 70beb4e7..841468a4 100644
--- a/src/AzureDataFactory.TestingFramework/Generated/Models/DataFactoryBlobTrigger.Serialization.cs
+++ b/src/AzureDataFactory.TestingFramework/Generated/Models/DataFactoryBlobTrigger.Serialization.cs
@@ -86,8 +86,8 @@ internal static DataFactoryBlobTrigger DeserializeDataFactoryBlobTrigger(JsonEle
             string folderPath = default;
             int maxConcurrency = default;
             DataFactoryLinkedServiceReference linkedService = default;
-            IDictionary<string, BinaryData> additionalProperties = default;
-            Dictionary<string, BinaryData> additionalPropertiesDictionary = new Dictionary<string, BinaryData>();
+            IDictionary<string, DataFactoryElement<string>> additionalProperties = default;
+            Dictionary<string, DataFactoryElement<string>> additionalPropertiesDictionary = new Dictionary<string, DataFactoryElement<string>>();
             foreach (var property in element.EnumerateObject())
             {
                 if (property.NameEquals("pipelines"u8))
@@ -171,7 +171,7 @@ internal static DataFactoryBlobTrigger DeserializeDataFactoryBlobTrigger(JsonEle
                     }
                     continue;
                 }
-                additionalPropertiesDictionary.Add(property.Name, BinaryData.FromString(property.Value.GetRawText()));
+                additionalPropertiesDictionary.Add(property.Name, JsonSerializer.Deserialize<DataFactoryElement<string>>(property.Value.GetRawText()));
             }
             additionalProperties = additionalPropertiesDictionary;
             return new DataFactoryBlobTrigger(type, description.Value, Optional.ToNullable(runtimeState), Optional.ToList(annotations), additionalProperties, Optional.ToList(pipelines), folderPath, maxConcurrency, linkedService);
diff --git a/src/AzureDataFactory.TestingFramework/Generated/Models/DataFactoryBlobTrigger.cs b/src/AzureDataFactory.TestingFramework/Generated/Models/DataFactoryBlobTrigger.cs
index 9d07207e..a7c95e6c 100644
--- a/src/AzureDataFactory.TestingFramework/Generated/Models/DataFactoryBlobTrigger.cs
+++ b/src/AzureDataFactory.TestingFramework/Generated/Models/DataFactoryBlobTrigger.cs
@@ -39,7 +39,7 @@ public DataFactoryBlobTrigger(string folderPath, int maxConcurrency, DataFactory
         /// <param name="folderPath"> The path of the container/folder that will trigger the pipeline. </param>
         /// <param name="maxConcurrency"> The max number of parallel files to handle when it is triggered. </param>
         /// <param name="linkedService"> The Azure Storage linked service reference. </param>
-        internal DataFactoryBlobTrigger(string triggerType, string description, DataFactoryTriggerRuntimeState? runtimeState, IList<BinaryData> annotations, IDictionary<string, BinaryData> additionalProperties, IList<TriggerPipelineReference> pipelines, string folderPath, int maxConcurrency, DataFactoryLinkedServiceReference linkedService) : base(triggerType, description, runtimeState, annotations, additionalProperties, pipelines)
+        internal DataFactoryBlobTrigger(string triggerType, string description, DataFactoryTriggerRuntimeState? runtimeState, IList<BinaryData> annotations, IDictionary<string, DataFactoryElement<string>> additionalProperties, IList<TriggerPipelineReference> pipelines, string folderPath, int maxConcurrency, DataFactoryLinkedServiceReference linkedService) : base(triggerType, description, runtimeState, annotations, additionalProperties, pipelines)
         {
             FolderPath = folderPath;
             MaxConcurrency = maxConcurrency;
diff --git a/src/AzureDataFactory.TestingFramework/Generated/Models/DataFactoryChangeDataCaptureData.Serialization.cs b/src/AzureDataFactory.TestingFramework/Generated/Models/DataFactoryChangeDataCaptureData.Serialization.cs
index b185a2dd..01dff45d 100644
--- a/src/AzureDataFactory.TestingFramework/Generated/Models/DataFactoryChangeDataCaptureData.Serialization.cs
+++ b/src/AzureDataFactory.TestingFramework/Generated/Models/DataFactoryChangeDataCaptureData.Serialization.cs
@@ -7,6 +7,7 @@
 
 using System.Text.Json;
 using Azure.Core;
+using Azure.Core.Expressions.DataFactory;
 using AzureDataFactory.TestingFramework.Models;
 using Azure.ResourceManager.Models;
 
@@ -86,8 +87,8 @@ internal static DataFactoryChangeDataCaptureData DeserializeDataFactoryChangeDat
             MapperPolicy policy = default;
             Optional<bool> allowVnetOverride = default;
             Optional<string> status = default;
-            IDictionary<string, BinaryData> additionalProperties = default;
-            Dictionary<string, BinaryData> additionalPropertiesDictionary = new Dictionary<string, BinaryData>();
+            IDictionary<string, DataFactoryElement<string>> additionalProperties = default;
+            Dictionary<string, DataFactoryElement<string>> additionalPropertiesDictionary = new Dictionary<string, DataFactoryElement<string>>();
             foreach (var property in element.EnumerateObject())
             {
                 if (property.NameEquals("etag"u8))
@@ -188,7 +189,7 @@ internal static DataFactoryChangeDataCaptureData DeserializeDataFactoryChangeDat
                     }
                     continue;
                 }
-                additionalPropertiesDictionary.Add(property.Name, BinaryData.FromString(property.Value.GetRawText()));
+                additionalPropertiesDictionary.Add(property.Name, JsonSerializer.Deserialize<DataFactoryElement<string>>(property.Value.GetRawText()));
             }
             additionalProperties = additionalPropertiesDictionary;
             return new DataFactoryChangeDataCaptureData(id, name, type, systemData.Value, folder.Value, description.Value, sourceConnectionsInfo, targetConnectionsInfo, policy, Optional.ToNullable(allowVnetOverride), status.Value, Optional.ToNullable(etag), additionalProperties);
diff --git a/src/AzureDataFactory.TestingFramework/Generated/Models/DataFactoryCredential.cs b/src/AzureDataFactory.TestingFramework/Generated/Models/DataFactoryCredential.cs
index 98d38c08..2509fd7b 100644
--- a/src/AzureDataFactory.TestingFramework/Generated/Models/DataFactoryCredential.cs
+++ b/src/AzureDataFactory.TestingFramework/Generated/Models/DataFactoryCredential.cs
@@ -6,6 +6,7 @@
 #nullable disable
 
 using Azure.Core;
+using Azure.Core.Expressions.DataFactory;
 
 namespace AzureDataFactory.TestingFramework.Models
 {
@@ -20,7 +21,7 @@ public partial class DataFactoryCredential
         public DataFactoryCredential()
         {
             Annotations = new ChangeTrackingList<BinaryData>();
-            AdditionalProperties = new ChangeTrackingDictionary<string, BinaryData>();
+            AdditionalProperties = new ChangeTrackingDictionary<string, DataFactoryElement<string>>();
         }
 
         /// <summary> Initializes a new instance of DataFactoryCredential. </summary>
@@ -28,7 +29,7 @@ public DataFactoryCredential()
         /// <param name="description"> Credential description. </param>
         /// <param name="annotations"> List of tags that can be used for describing the Credential. </param>
         /// <param name="additionalProperties"> Additional Properties. </param>
-        internal DataFactoryCredential(string credentialType, string description, IList<BinaryData> annotations, IDictionary<string, BinaryData> additionalProperties)
+        internal DataFactoryCredential(string credentialType, string description, IList<BinaryData> annotations, IDictionary<string, DataFactoryElement<string>> additionalProperties)
         {
             CredentialType = credentialType;
             Description = description;
@@ -101,6 +102,6 @@ internal DataFactoryCredential(string credentialType, string description, IList<
         /// </list>
         /// </para>
         /// </summary>
-        public IDictionary<string, BinaryData> AdditionalProperties { get; }
+        public IDictionary<string, DataFactoryElement<string>> AdditionalProperties { get; }
     }
 }
diff --git a/src/AzureDataFactory.TestingFramework/Generated/Models/DataFactoryCredentialReference.Serialization.cs b/src/AzureDataFactory.TestingFramework/Generated/Models/DataFactoryCredentialReference.Serialization.cs
index b5b5134c..a0d9e13a 100644
--- a/src/AzureDataFactory.TestingFramework/Generated/Models/DataFactoryCredentialReference.Serialization.cs
+++ b/src/AzureDataFactory.TestingFramework/Generated/Models/DataFactoryCredentialReference.Serialization.cs
@@ -7,6 +7,7 @@
 
 using System.Text.Json;
 using Azure.Core;
+using Azure.Core.Expressions.DataFactory;
 
 namespace AzureDataFactory.TestingFramework.Models
 {
@@ -39,8 +40,8 @@ internal static DataFactoryCredentialReference DeserializeDataFactoryCredentialR
             }
             DataFactoryCredentialReferenceType type = default;
             string referenceName = default;
-            IDictionary<string, BinaryData> additionalProperties = default;
-            Dictionary<string, BinaryData> additionalPropertiesDictionary = new Dictionary<string, BinaryData>();
+            IDictionary<string, DataFactoryElement<string>> additionalProperties = default;
+            Dictionary<string, DataFactoryElement<string>> additionalPropertiesDictionary = new Dictionary<string, DataFactoryElement<string>>();
             foreach (var property in element.EnumerateObject())
             {
                 if (property.NameEquals("type"u8))
@@ -53,7 +54,7 @@ internal static DataFactoryCredentialReference DeserializeDataFactoryCredentialR
                     referenceName = property.Value.GetString();
                     continue;
                 }
-                additionalPropertiesDictionary.Add(property.Name, BinaryData.FromString(property.Value.GetRawText()));
+                additionalPropertiesDictionary.Add(property.Name, JsonSerializer.Deserialize<DataFactoryElement<string>>(property.Value.GetRawText()));
             }
             additionalProperties = additionalPropertiesDictionary;
             return new DataFactoryCredentialReference(type, referenceName, additionalProperties);
diff --git a/src/AzureDataFactory.TestingFramework/Generated/Models/DataFactoryCredentialReference.cs b/src/AzureDataFactory.TestingFramework/Generated/Models/DataFactoryCredentialReference.cs
index 636e7473..8824a9ad 100644
--- a/src/AzureDataFactory.TestingFramework/Generated/Models/DataFactoryCredentialReference.cs
+++ b/src/AzureDataFactory.TestingFramework/Generated/Models/DataFactoryCredentialReference.cs
@@ -6,6 +6,7 @@
 #nullable disable
 
 using Azure.Core;
+using Azure.Core.Expressions.DataFactory;
 
 namespace AzureDataFactory.TestingFramework.Models
 {
@@ -22,14 +23,14 @@ public DataFactoryCredentialReference(DataFactoryCredentialReferenceType referen
 
             ReferenceType = referenceType;
             ReferenceName = referenceName;
-            AdditionalProperties = new ChangeTrackingDictionary<string, BinaryData>();
+            AdditionalProperties = new ChangeTrackingDictionary<string, DataFactoryElement<string>>();
         }
 
         /// <summary> Initializes a new instance of DataFactoryCredentialReference. </summary>
         /// <param name="referenceType"> Credential reference type. </param>
         /// <param name="referenceName"> Reference credential name. </param>
         /// <param name="additionalProperties"> Additional Properties. </param>
-        internal DataFactoryCredentialReference(DataFactoryCredentialReferenceType referenceType, string referenceName, IDictionary<string, BinaryData> additionalProperties)
+        internal DataFactoryCredentialReference(DataFactoryCredentialReferenceType referenceType, string referenceName, IDictionary<string, DataFactoryElement<string>> additionalProperties)
         {
             ReferenceType = referenceType;
             ReferenceName = referenceName;
@@ -70,6 +71,6 @@ internal DataFactoryCredentialReference(DataFactoryCredentialReferenceType refer
         /// </list>
         /// </para>
         /// </summary>
-        public IDictionary<string, BinaryData> AdditionalProperties { get; }
+        public IDictionary<string, DataFactoryElement<string>> AdditionalProperties { get; }
     }
 }
diff --git a/src/AzureDataFactory.TestingFramework/Generated/Models/DataFactoryData.Serialization.cs b/src/AzureDataFactory.TestingFramework/Generated/Models/DataFactoryData.Serialization.cs
index 1d3b92f7..0b28ef56 100644
--- a/src/AzureDataFactory.TestingFramework/Generated/Models/DataFactoryData.Serialization.cs
+++ b/src/AzureDataFactory.TestingFramework/Generated/Models/DataFactoryData.Serialization.cs
@@ -7,6 +7,7 @@
 
 using System.Text.Json;
 using Azure.Core;
+using Azure.Core.Expressions.DataFactory;
 using AzureDataFactory.TestingFramework.Models;
 using Azure.ResourceManager.Models;
 
@@ -104,8 +105,8 @@ internal static DataFactoryData DeserializeDataFactoryData(JsonElement element)
             Optional<IDictionary<string, DataFactoryGlobalParameterProperties>> globalParameters = default;
             Optional<DataFactoryEncryptionConfiguration> encryption = default;
             Optional<DataFactoryPublicNetworkAccess> publicNetworkAccess = default;
-            IDictionary<string, BinaryData> additionalProperties = default;
-            Dictionary<string, BinaryData> additionalPropertiesDictionary = new Dictionary<string, BinaryData>();
+            IDictionary<string, DataFactoryElement<string>> additionalProperties = default;
+            Dictionary<string, DataFactoryElement<string>> additionalPropertiesDictionary = new Dictionary<string, DataFactoryElement<string>>();
             foreach (var property in element.EnumerateObject())
             {
                 if (property.NameEquals("identity"u8))
@@ -251,7 +252,7 @@ internal static DataFactoryData DeserializeDataFactoryData(JsonElement element)
                     }
                     continue;
                 }
-                additionalPropertiesDictionary.Add(property.Name, BinaryData.FromString(property.Value.GetRawText()));
+                additionalPropertiesDictionary.Add(property.Name, JsonSerializer.Deserialize<DataFactoryElement<string>>(property.Value.GetRawText()));
             }
             additionalProperties = additionalPropertiesDictionary;
             return new DataFactoryData(id, name, type, systemData.Value, Optional.ToDictionary(tags), location, identity, provisioningState.Value, Optional.ToNullable(createTime), version.Value, purviewConfiguration.Value, repoConfiguration.Value, Optional.ToDictionary(globalParameters), encryption.Value, Optional.ToNullable(publicNetworkAccess), Optional.ToNullable(eTag), additionalProperties);
diff --git a/src/AzureDataFactory.TestingFramework/Generated/Models/DataFactoryDataFlowDebugPackageContent.cs b/src/AzureDataFactory.TestingFramework/Generated/Models/DataFactoryDataFlowDebugPackageContent.cs
index 6fe09b6c..e66ced06 100644
--- a/src/AzureDataFactory.TestingFramework/Generated/Models/DataFactoryDataFlowDebugPackageContent.cs
+++ b/src/AzureDataFactory.TestingFramework/Generated/Models/DataFactoryDataFlowDebugPackageContent.cs
@@ -6,6 +6,7 @@
 #nullable disable
 
 using Azure.Core;
+using Azure.Core.Expressions.DataFactory;
 
 namespace AzureDataFactory.TestingFramework.Models
 {
@@ -18,7 +19,7 @@ public DataFactoryDataFlowDebugPackageContent()
             DataFlows = new ChangeTrackingList<DataFactoryDataFlowDebugInfo>();
             Datasets = new ChangeTrackingList<DataFactoryDatasetDebugInfo>();
             LinkedServices = new ChangeTrackingList<DataFactoryLinkedServiceDebugInfo>();
-            AdditionalProperties = new ChangeTrackingDictionary<string, BinaryData>();
+            AdditionalProperties = new ChangeTrackingDictionary<string, DataFactoryElement<string>>();
         }
 
         /// <summary> The ID of data flow debug session. </summary>
@@ -65,6 +66,6 @@ public DataFactoryDataFlowDebugPackageContent()
         /// </list>
         /// </para>
         /// </summary>
-        public IDictionary<string, BinaryData> AdditionalProperties { get; }
+        public IDictionary<string, DataFactoryElement<string>> AdditionalProperties { get; }
     }
 }
diff --git a/src/AzureDataFactory.TestingFramework/Generated/Models/DataFactoryDatasetProperties.cs b/src/AzureDataFactory.TestingFramework/Generated/Models/DataFactoryDatasetProperties.cs
index 14d69351..3da98f58 100644
--- a/src/AzureDataFactory.TestingFramework/Generated/Models/DataFactoryDatasetProperties.cs
+++ b/src/AzureDataFactory.TestingFramework/Generated/Models/DataFactoryDatasetProperties.cs
@@ -27,7 +27,7 @@ public DataFactoryDatasetProperties(DataFactoryLinkedServiceReference linkedServ
             LinkedServiceName = linkedServiceName;
             Parameters = new ChangeTrackingDictionary<string, EntityParameterSpecification>();
             Annotations = new ChangeTrackingList<BinaryData>();
-            AdditionalProperties = new ChangeTrackingDictionary<string, BinaryData>();
+            AdditionalProperties = new ChangeTrackingDictionary<string, DataFactoryElement<string>>();
         }
 
         /// <summary> Initializes a new instance of DataFactoryDatasetProperties. </summary>
@@ -40,7 +40,7 @@ public DataFactoryDatasetProperties(DataFactoryLinkedServiceReference linkedServ
         /// <param name="annotations"> List of tags that can be used for describing the Dataset. </param>
         /// <param name="folder"> The folder that this Dataset is in. If not specified, Dataset will appear at the root level. </param>
         /// <param name="additionalProperties"> Additional Properties. </param>
-        internal DataFactoryDatasetProperties(string datasetType, string description, DataFactoryElement<IList<DatasetDataElement>> structure, DataFactoryElement<IList<DatasetSchemaDataElement>> schema, DataFactoryLinkedServiceReference linkedServiceName, IDictionary<string, EntityParameterSpecification> parameters, IList<BinaryData> annotations, DatasetFolder folder, IDictionary<string, BinaryData> additionalProperties)
+        internal DataFactoryDatasetProperties(string datasetType, string description, DataFactoryElement<IList<DatasetDataElement>> structure, DataFactoryElement<IList<DatasetSchemaDataElement>> schema, DataFactoryLinkedServiceReference linkedServiceName, IDictionary<string, EntityParameterSpecification> parameters, IList<BinaryData> annotations, DatasetFolder folder, IDictionary<string, DataFactoryElement<string>> additionalProperties)
         {
             DatasetType = datasetType;
             Description = description;
@@ -140,6 +140,6 @@ public string FolderName
         /// </list>
         /// </para>
         /// </summary>
-        public IDictionary<string, BinaryData> AdditionalProperties { get; }
+        public IDictionary<string, DataFactoryElement<string>> AdditionalProperties { get; }
     }
 }
diff --git a/src/AzureDataFactory.TestingFramework/Generated/Models/DataFactoryHttpDataset.Serialization.cs b/src/AzureDataFactory.TestingFramework/Generated/Models/DataFactoryHttpDataset.Serialization.cs
index 3e8c7856..f4ecb9a5 100644
--- a/src/AzureDataFactory.TestingFramework/Generated/Models/DataFactoryHttpDataset.Serialization.cs
+++ b/src/AzureDataFactory.TestingFramework/Generated/Models/DataFactoryHttpDataset.Serialization.cs
@@ -134,8 +134,8 @@ internal static DataFactoryHttpDataset DeserializeDataFactoryHttpDataset(JsonEle
             Optional<DataFactoryElement<string>> additionalHeaders = default;
             Optional<DatasetStorageFormat> format = default;
             Optional<DatasetCompression> compression = default;
-            IDictionary<string, BinaryData> additionalProperties = default;
-            Dictionary<string, BinaryData> additionalPropertiesDictionary = new Dictionary<string, BinaryData>();
+            IDictionary<string, DataFactoryElement<string>> additionalProperties = default;
+            Dictionary<string, DataFactoryElement<string>> additionalPropertiesDictionary = new Dictionary<string, DataFactoryElement<string>>();
             foreach (var property in element.EnumerateObject())
             {
                 if (property.NameEquals("type"u8))
@@ -281,7 +281,7 @@ internal static DataFactoryHttpDataset DeserializeDataFactoryHttpDataset(JsonEle
                     }
                     continue;
                 }
-                additionalPropertiesDictionary.Add(property.Name, BinaryData.FromString(property.Value.GetRawText()));
+                additionalPropertiesDictionary.Add(property.Name, JsonSerializer.Deserialize<DataFactoryElement<string>>(property.Value.GetRawText()));
             }
             additionalProperties = additionalPropertiesDictionary;
             return new DataFactoryHttpDataset(type, description.Value, structure.Value, schema.Value, linkedServiceName, Optional.ToDictionary(parameters), Optional.ToList(annotations), folder.Value, additionalProperties, relativeUrl.Value, requestMethod.Value, requestBody.Value, additionalHeaders.Value, format.Value, compression.Value);
diff --git a/src/AzureDataFactory.TestingFramework/Generated/Models/DataFactoryHttpDataset.cs b/src/AzureDataFactory.TestingFramework/Generated/Models/DataFactoryHttpDataset.cs
index f7379015..94ec615c 100644
--- a/src/AzureDataFactory.TestingFramework/Generated/Models/DataFactoryHttpDataset.cs
+++ b/src/AzureDataFactory.TestingFramework/Generated/Models/DataFactoryHttpDataset.cs
@@ -47,7 +47,7 @@ public DataFactoryHttpDataset(DataFactoryLinkedServiceReference linkedServiceNam
         /// The available derived classes include <see cref="DatasetAvroFormat"/>, <see cref="DatasetJsonFormat"/>, <see cref="DatasetOrcFormat"/>, <see cref="DatasetParquetFormat"/> and <see cref="DatasetTextFormat"/>.
         /// </param>
         /// <param name="compression"> The data compression method used on files. </param>
-        internal DataFactoryHttpDataset(string datasetType, string description, DataFactoryElement<IList<DatasetDataElement>> structure, DataFactoryElement<IList<DatasetSchemaDataElement>> schema, DataFactoryLinkedServiceReference linkedServiceName, IDictionary<string, EntityParameterSpecification> parameters, IList<BinaryData> annotations, DatasetFolder folder, IDictionary<string, BinaryData> additionalProperties, DataFactoryElement<string> relativeUri, DataFactoryElement<string> requestMethod, DataFactoryElement<string> requestBody, DataFactoryElement<string> additionalHeaders, DatasetStorageFormat format, DatasetCompression compression) : base(datasetType, description, structure, schema, linkedServiceName, parameters, annotations, folder, additionalProperties)
+        internal DataFactoryHttpDataset(string datasetType, string description, DataFactoryElement<IList<DatasetDataElement>> structure, DataFactoryElement<IList<DatasetSchemaDataElement>> schema, DataFactoryLinkedServiceReference linkedServiceName, IDictionary<string, EntityParameterSpecification> parameters, IList<BinaryData> annotations, DatasetFolder folder, IDictionary<string, DataFactoryElement<string>> additionalProperties, DataFactoryElement<string> relativeUri, DataFactoryElement<string> requestMethod, DataFactoryElement<string> requestBody, DataFactoryElement<string> additionalHeaders, DatasetStorageFormat format, DatasetCompression compression) : base(datasetType, description, structure, schema, linkedServiceName, parameters, annotations, folder, additionalProperties)
         {
             RelativeUri = relativeUri;
             RequestMethod = requestMethod;
diff --git a/src/AzureDataFactory.TestingFramework/Generated/Models/DataFactoryHttpFileSource.Serialization.cs b/src/AzureDataFactory.TestingFramework/Generated/Models/DataFactoryHttpFileSource.Serialization.cs
index d9c9cb1d..0b6679af 100644
--- a/src/AzureDataFactory.TestingFramework/Generated/Models/DataFactoryHttpFileSource.Serialization.cs
+++ b/src/AzureDataFactory.TestingFramework/Generated/Models/DataFactoryHttpFileSource.Serialization.cs
@@ -67,8 +67,8 @@ internal static DataFactoryHttpFileSource DeserializeDataFactoryHttpFileSource(J
             Optional<DataFactoryElement<string>> sourceRetryWait = default;
             Optional<DataFactoryElement<int>> maxConcurrentConnections = default;
             Optional<DataFactoryElement<bool>> disableMetricsCollection = default;
-            IDictionary<string, BinaryData> additionalProperties = default;
-            Dictionary<string, BinaryData> additionalPropertiesDictionary = new Dictionary<string, BinaryData>();
+            IDictionary<string, DataFactoryElement<string>> additionalProperties = default;
+            Dictionary<string, DataFactoryElement<string>> additionalPropertiesDictionary = new Dictionary<string, DataFactoryElement<string>>();
             foreach (var property in element.EnumerateObject())
             {
                 if (property.NameEquals("httpRequestTimeout"u8))
@@ -121,7 +121,7 @@ internal static DataFactoryHttpFileSource DeserializeDataFactoryHttpFileSource(J
                     disableMetricsCollection = JsonSerializer.Deserialize<DataFactoryElement<bool>>(property.Value.GetRawText());
                     continue;
                 }
-                additionalPropertiesDictionary.Add(property.Name, BinaryData.FromString(property.Value.GetRawText()));
+                additionalPropertiesDictionary.Add(property.Name, JsonSerializer.Deserialize<DataFactoryElement<string>>(property.Value.GetRawText()));
             }
             additionalProperties = additionalPropertiesDictionary;
             return new DataFactoryHttpFileSource(type, sourceRetryCount.Value, sourceRetryWait.Value, maxConcurrentConnections.Value, disableMetricsCollection.Value, additionalProperties, httpRequestTimeout.Value);
diff --git a/src/AzureDataFactory.TestingFramework/Generated/Models/DataFactoryHttpFileSource.cs b/src/AzureDataFactory.TestingFramework/Generated/Models/DataFactoryHttpFileSource.cs
index 0510b23e..5cb840f3 100644
--- a/src/AzureDataFactory.TestingFramework/Generated/Models/DataFactoryHttpFileSource.cs
+++ b/src/AzureDataFactory.TestingFramework/Generated/Models/DataFactoryHttpFileSource.cs
@@ -26,7 +26,7 @@ public DataFactoryHttpFileSource()
         /// <param name="disableMetricsCollection"> If true, disable data store metrics collection. Default is false. Type: boolean (or Expression with resultType boolean). </param>
         /// <param name="additionalProperties"> Additional Properties. </param>
         /// <param name="httpRequestTimeout"> Specifies the timeout for a HTTP client to get HTTP response from HTTP server. The default value is equivalent to System.Net.HttpWebRequest.Timeout. Type: string (or Expression with resultType string), pattern: ((\d+)\.)?(\d\d):(60|([0-5][0-9])):(60|([0-5][0-9])). </param>
-        internal DataFactoryHttpFileSource(string copySourceType, DataFactoryElement<int> sourceRetryCount, DataFactoryElement<string> sourceRetryWait, DataFactoryElement<int> maxConcurrentConnections, DataFactoryElement<bool> disableMetricsCollection, IDictionary<string, BinaryData> additionalProperties, DataFactoryElement<string> httpRequestTimeout) : base(copySourceType, sourceRetryCount, sourceRetryWait, maxConcurrentConnections, disableMetricsCollection, additionalProperties)
+        internal DataFactoryHttpFileSource(string copySourceType, DataFactoryElement<int> sourceRetryCount, DataFactoryElement<string> sourceRetryWait, DataFactoryElement<int> maxConcurrentConnections, DataFactoryElement<bool> disableMetricsCollection, IDictionary<string, DataFactoryElement<string>> additionalProperties, DataFactoryElement<string> httpRequestTimeout) : base(copySourceType, sourceRetryCount, sourceRetryWait, maxConcurrentConnections, disableMetricsCollection, additionalProperties)
         {
             HttpRequestTimeout = httpRequestTimeout;
             CopySourceType = copySourceType ?? "HttpSource";
diff --git a/src/AzureDataFactory.TestingFramework/Generated/Models/DataFactoryIntegrationRuntimeProperties.cs b/src/AzureDataFactory.TestingFramework/Generated/Models/DataFactoryIntegrationRuntimeProperties.cs
index 3ebd7ba5..d796621f 100644
--- a/src/AzureDataFactory.TestingFramework/Generated/Models/DataFactoryIntegrationRuntimeProperties.cs
+++ b/src/AzureDataFactory.TestingFramework/Generated/Models/DataFactoryIntegrationRuntimeProperties.cs
@@ -6,6 +6,7 @@
 #nullable disable
 
 using Azure.Core;
+using Azure.Core.Expressions.DataFactory;
 
 namespace AzureDataFactory.TestingFramework.Models
 {
@@ -19,14 +20,14 @@ public partial class DataFactoryIntegrationRuntimeProperties
         /// <summary> Initializes a new instance of DataFactoryIntegrationRuntimeProperties. </summary>
         public DataFactoryIntegrationRuntimeProperties()
         {
-            AdditionalProperties = new ChangeTrackingDictionary<string, BinaryData>();
+            AdditionalProperties = new ChangeTrackingDictionary<string, DataFactoryElement<string>>();
         }
 
         /// <summary> Initializes a new instance of DataFactoryIntegrationRuntimeProperties. </summary>
         /// <param name="integrationRuntimeType"> Type of integration runtime. </param>
         /// <param name="description"> Integration runtime description. </param>
         /// <param name="additionalProperties"> Additional Properties. </param>
-        internal DataFactoryIntegrationRuntimeProperties(IntegrationRuntimeType integrationRuntimeType, string description, IDictionary<string, BinaryData> additionalProperties)
+        internal DataFactoryIntegrationRuntimeProperties(IntegrationRuntimeType integrationRuntimeType, string description, IDictionary<string, DataFactoryElement<string>> additionalProperties)
         {
             IntegrationRuntimeType = integrationRuntimeType;
             Description = description;
@@ -67,6 +68,6 @@ internal DataFactoryIntegrationRuntimeProperties(IntegrationRuntimeType integrat
         /// </list>
         /// </para>
         /// </summary>
-        public IDictionary<string, BinaryData> AdditionalProperties { get; }
+        public IDictionary<string, DataFactoryElement<string>> AdditionalProperties { get; }
     }
 }
diff --git a/src/AzureDataFactory.TestingFramework/Generated/Models/DataFactoryLinkedServiceProperties.cs b/src/AzureDataFactory.TestingFramework/Generated/Models/DataFactoryLinkedServiceProperties.cs
index 723e4182..1ddb9614 100644
--- a/src/AzureDataFactory.TestingFramework/Generated/Models/DataFactoryLinkedServiceProperties.cs
+++ b/src/AzureDataFactory.TestingFramework/Generated/Models/DataFactoryLinkedServiceProperties.cs
@@ -6,6 +6,7 @@
 #nullable disable
 
 using Azure.Core;
+using Azure.Core.Expressions.DataFactory;
 
 namespace AzureDataFactory.TestingFramework.Models
 {
@@ -21,7 +22,7 @@ public DataFactoryLinkedServiceProperties()
         {
             Parameters = new ChangeTrackingDictionary<string, EntityParameterSpecification>();
             Annotations = new ChangeTrackingList<BinaryData>();
-            AdditionalProperties = new ChangeTrackingDictionary<string, BinaryData>();
+            AdditionalProperties = new ChangeTrackingDictionary<string, DataFactoryElement<string>>();
         }
 
         /// <summary> Initializes a new instance of DataFactoryLinkedServiceProperties. </summary>
@@ -31,7 +32,7 @@ public DataFactoryLinkedServiceProperties()
         /// <param name="parameters"> Parameters for linked service. </param>
         /// <param name="annotations"> List of tags that can be used for describing the linked service. </param>
         /// <param name="additionalProperties"> Additional Properties. </param>
-        internal DataFactoryLinkedServiceProperties(string linkedServiceType, IntegrationRuntimeReference connectVia, string description, IDictionary<string, EntityParameterSpecification> parameters, IList<BinaryData> annotations, IDictionary<string, BinaryData> additionalProperties)
+        internal DataFactoryLinkedServiceProperties(string linkedServiceType, IntegrationRuntimeReference connectVia, string description, IDictionary<string, EntityParameterSpecification> parameters, IList<BinaryData> annotations, IDictionary<string, DataFactoryElement<string>> additionalProperties)
         {
             LinkedServiceType = linkedServiceType;
             ConnectVia = connectVia;
@@ -110,6 +111,6 @@ internal DataFactoryLinkedServiceProperties(string linkedServiceType, Integratio
         /// </list>
         /// </para>
         /// </summary>
-        public IDictionary<string, BinaryData> AdditionalProperties { get; }
+        public IDictionary<string, DataFactoryElement<string>> AdditionalProperties { get; }
     }
 }
diff --git a/src/AzureDataFactory.TestingFramework/Generated/Models/DataFactoryManagedIdentityCredentialProperties.Serialization.cs b/src/AzureDataFactory.TestingFramework/Generated/Models/DataFactoryManagedIdentityCredentialProperties.Serialization.cs
index caa34a01..86c7d84a 100644
--- a/src/AzureDataFactory.TestingFramework/Generated/Models/DataFactoryManagedIdentityCredentialProperties.Serialization.cs
+++ b/src/AzureDataFactory.TestingFramework/Generated/Models/DataFactoryManagedIdentityCredentialProperties.Serialization.cs
@@ -7,6 +7,7 @@
 
 using System.Text.Json;
 using Azure.Core;
+using Azure.Core.Expressions.DataFactory;
 
 namespace AzureDataFactory.TestingFramework.Models
 {
@@ -71,8 +72,8 @@ internal static DataFactoryManagedIdentityCredentialProperties DeserializeDataFa
             Optional<string> description = default;
             Optional<IList<BinaryData>> annotations = default;
             Optional<ResourceIdentifier> resourceId = default;
-            IDictionary<string, BinaryData> additionalProperties = default;
-            Dictionary<string, BinaryData> additionalPropertiesDictionary = new Dictionary<string, BinaryData>();
+            IDictionary<string, DataFactoryElement<string>> additionalProperties = default;
+            Dictionary<string, DataFactoryElement<string>> additionalPropertiesDictionary = new Dictionary<string, DataFactoryElement<string>>();
             foreach (var property in element.EnumerateObject())
             {
                 if (property.NameEquals("type"u8))
@@ -127,7 +128,7 @@ internal static DataFactoryManagedIdentityCredentialProperties DeserializeDataFa
                     }
                     continue;
                 }
-                additionalPropertiesDictionary.Add(property.Name, BinaryData.FromString(property.Value.GetRawText()));
+                additionalPropertiesDictionary.Add(property.Name, JsonSerializer.Deserialize<DataFactoryElement<string>>(property.Value.GetRawText()));
             }
             additionalProperties = additionalPropertiesDictionary;
             return new DataFactoryManagedIdentityCredentialProperties(type, description.Value, Optional.ToList(annotations), additionalProperties, resourceId.Value);
diff --git a/src/AzureDataFactory.TestingFramework/Generated/Models/DataFactoryManagedIdentityCredentialProperties.cs b/src/AzureDataFactory.TestingFramework/Generated/Models/DataFactoryManagedIdentityCredentialProperties.cs
index cc667974..bb60afa4 100644
--- a/src/AzureDataFactory.TestingFramework/Generated/Models/DataFactoryManagedIdentityCredentialProperties.cs
+++ b/src/AzureDataFactory.TestingFramework/Generated/Models/DataFactoryManagedIdentityCredentialProperties.cs
@@ -6,6 +6,7 @@
 #nullable disable
 
 using Azure.Core;
+using Azure.Core.Expressions.DataFactory;
 
 namespace AzureDataFactory.TestingFramework.Models
 {
@@ -24,7 +25,7 @@ public DataFactoryManagedIdentityCredentialProperties()
         /// <param name="annotations"> List of tags that can be used for describing the Credential. </param>
         /// <param name="additionalProperties"> Additional Properties. </param>
         /// <param name="resourceId"> The resource id of user assigned managed identity. </param>
-        internal DataFactoryManagedIdentityCredentialProperties(string credentialType, string description, IList<BinaryData> annotations, IDictionary<string, BinaryData> additionalProperties, ResourceIdentifier resourceId) : base(credentialType, description, annotations, additionalProperties)
+        internal DataFactoryManagedIdentityCredentialProperties(string credentialType, string description, IList<BinaryData> annotations, IDictionary<string, DataFactoryElement<string>> additionalProperties, ResourceIdentifier resourceId) : base(credentialType, description, annotations, additionalProperties)
         {
             ResourceId = resourceId;
             CredentialType = credentialType ?? "ManagedIdentity";
diff --git a/src/AzureDataFactory.TestingFramework/Generated/Models/DataFactoryManagedVirtualNetworkProperties.Serialization.cs b/src/AzureDataFactory.TestingFramework/Generated/Models/DataFactoryManagedVirtualNetworkProperties.Serialization.cs
index d1b33d45..52eca528 100644
--- a/src/AzureDataFactory.TestingFramework/Generated/Models/DataFactoryManagedVirtualNetworkProperties.Serialization.cs
+++ b/src/AzureDataFactory.TestingFramework/Generated/Models/DataFactoryManagedVirtualNetworkProperties.Serialization.cs
@@ -7,6 +7,7 @@
 
 using System.Text.Json;
 using Azure.Core;
+using Azure.Core.Expressions.DataFactory;
 
 namespace AzureDataFactory.TestingFramework.Models
 {
@@ -35,8 +36,8 @@ internal static DataFactoryManagedVirtualNetworkProperties DeserializeDataFactor
             }
             Optional<Guid> vnetId = default;
             Optional<string> @alias = default;
-            IDictionary<string, BinaryData> additionalProperties = default;
-            Dictionary<string, BinaryData> additionalPropertiesDictionary = new Dictionary<string, BinaryData>();
+            IDictionary<string, DataFactoryElement<string>> additionalProperties = default;
+            Dictionary<string, DataFactoryElement<string>> additionalPropertiesDictionary = new Dictionary<string, DataFactoryElement<string>>();
             foreach (var property in element.EnumerateObject())
             {
                 if (property.NameEquals("vNetId"u8))
@@ -53,7 +54,7 @@ internal static DataFactoryManagedVirtualNetworkProperties DeserializeDataFactor
                     @alias = property.Value.GetString();
                     continue;
                 }
-                additionalPropertiesDictionary.Add(property.Name, BinaryData.FromString(property.Value.GetRawText()));
+                additionalPropertiesDictionary.Add(property.Name, JsonSerializer.Deserialize<DataFactoryElement<string>>(property.Value.GetRawText()));
             }
             additionalProperties = additionalPropertiesDictionary;
             return new DataFactoryManagedVirtualNetworkProperties(Optional.ToNullable(vnetId), @alias.Value, additionalProperties);
diff --git a/src/AzureDataFactory.TestingFramework/Generated/Models/DataFactoryManagedVirtualNetworkProperties.cs b/src/AzureDataFactory.TestingFramework/Generated/Models/DataFactoryManagedVirtualNetworkProperties.cs
index 60d81436..52ac2794 100644
--- a/src/AzureDataFactory.TestingFramework/Generated/Models/DataFactoryManagedVirtualNetworkProperties.cs
+++ b/src/AzureDataFactory.TestingFramework/Generated/Models/DataFactoryManagedVirtualNetworkProperties.cs
@@ -6,6 +6,7 @@
 #nullable disable
 
 using Azure.Core;
+using Azure.Core.Expressions.DataFactory;
 
 namespace AzureDataFactory.TestingFramework.Models
 {
@@ -15,14 +16,14 @@ public partial class DataFactoryManagedVirtualNetworkProperties
         /// <summary> Initializes a new instance of DataFactoryManagedVirtualNetworkProperties. </summary>
         public DataFactoryManagedVirtualNetworkProperties()
         {
-            AdditionalProperties = new ChangeTrackingDictionary<string, BinaryData>();
+            AdditionalProperties = new ChangeTrackingDictionary<string, DataFactoryElement<string>>();
         }
 
         /// <summary> Initializes a new instance of DataFactoryManagedVirtualNetworkProperties. </summary>
         /// <param name="vnetId"> Managed Virtual Network ID. </param>
         /// <param name="alias"> Managed Virtual Network alias. </param>
         /// <param name="additionalProperties"> Additional Properties. </param>
-        internal DataFactoryManagedVirtualNetworkProperties(Guid? vnetId, string @alias, IDictionary<string, BinaryData> additionalProperties)
+        internal DataFactoryManagedVirtualNetworkProperties(Guid? vnetId, string @alias, IDictionary<string, DataFactoryElement<string>> additionalProperties)
         {
             VnetId = vnetId;
             Alias = @alias;
@@ -63,6 +64,6 @@ internal DataFactoryManagedVirtualNetworkProperties(Guid? vnetId, string @alias,
         /// </list>
         /// </para>
         /// </summary>
-        public IDictionary<string, BinaryData> AdditionalProperties { get; }
+        public IDictionary<string, DataFactoryElement<string>> AdditionalProperties { get; }
     }
 }
diff --git a/src/AzureDataFactory.TestingFramework/Generated/Models/DataFactoryPipelineData.Serialization.cs b/src/AzureDataFactory.TestingFramework/Generated/Models/DataFactoryPipelineData.Serialization.cs
index 4dd56bf1..684bd7e9 100644
--- a/src/AzureDataFactory.TestingFramework/Generated/Models/DataFactoryPipelineData.Serialization.cs
+++ b/src/AzureDataFactory.TestingFramework/Generated/Models/DataFactoryPipelineData.Serialization.cs
@@ -7,6 +7,7 @@
 
 using System.Text.Json;
 using Azure.Core;
+using Azure.Core.Expressions.DataFactory;
 using AzureDataFactory.TestingFramework.Models;
 using Azure.ResourceManager.Models;
 
@@ -140,11 +141,11 @@ internal static Pipeline DeserializeDataFactoryPipelineData(JsonElement element)
             Optional<IDictionary<string, PipelineVariableSpecification>> variables = default;
             Optional<int> concurrency = default;
             Optional<IList<BinaryData>> annotations = default;
-            Optional<IDictionary<string, BinaryData>> runDimensions = default;
+            Optional<IDictionary<string, DataFactoryElement<string>>> runDimensions = default;
             Optional<PipelineFolder> folder = default;
             Optional<DataFactoryPipelinePolicy> policy = default;
-            IDictionary<string, BinaryData> additionalProperties = default;
-            Dictionary<string, BinaryData> additionalPropertiesDictionary = new Dictionary<string, BinaryData>();
+            IDictionary<string, DataFactoryElement<string>> additionalProperties = default;
+            Dictionary<string, DataFactoryElement<string>> additionalPropertiesDictionary = new Dictionary<string, DataFactoryElement<string>>();
             foreach (var property in element.EnumerateObject())
             {
                 if (property.NameEquals("etag"u8))
@@ -272,7 +273,7 @@ internal static Pipeline DeserializeDataFactoryPipelineData(JsonElement element)
                             {
                                 continue;
                             }
-                            Dictionary<string, BinaryData> dictionary = new Dictionary<string, BinaryData>();
+                            Dictionary<string, DataFactoryElement<string>> dictionary = new Dictionary<string, DataFactoryElement<string>>();
                             foreach (var property1 in property0.Value.EnumerateObject())
                             {
                                 if (property1.Value.ValueKind == JsonValueKind.Null)
@@ -281,7 +282,7 @@ internal static Pipeline DeserializeDataFactoryPipelineData(JsonElement element)
                                 }
                                 else
                                 {
-                                    dictionary.Add(property1.Name, BinaryData.FromString(property1.Value.GetRawText()));
+                                    dictionary.Add(property1.Name, JsonSerializer.Deserialize<DataFactoryElement<string>>(property1.Value.GetRawText()));
                                 }
                             }
                             runDimensions = dictionary;
@@ -308,7 +309,7 @@ internal static Pipeline DeserializeDataFactoryPipelineData(JsonElement element)
                     }
                     continue;
                 }
-                additionalPropertiesDictionary.Add(property.Name, BinaryData.FromString(property.Value.GetRawText()));
+                additionalPropertiesDictionary.Add(property.Name, JsonSerializer.Deserialize<DataFactoryElement<string>>(property.Value.GetRawText()));
             }
             additionalProperties = additionalPropertiesDictionary;
             return new Pipeline(id, name, type, systemData.Value, description.Value, Optional.ToList(activities), Optional.ToDictionary(parameters), Optional.ToDictionary(variables), Optional.ToNullable(concurrency), Optional.ToList(annotations), Optional.ToDictionary(runDimensions), folder.Value, policy.Value, Optional.ToNullable(etag), additionalProperties);
diff --git a/src/AzureDataFactory.TestingFramework/Generated/Models/DataFactoryPipelineRunInfo.Serialization.cs b/src/AzureDataFactory.TestingFramework/Generated/Models/DataFactoryPipelineRunInfo.Serialization.cs
index 1e035457..dd03c36e 100644
--- a/src/AzureDataFactory.TestingFramework/Generated/Models/DataFactoryPipelineRunInfo.Serialization.cs
+++ b/src/AzureDataFactory.TestingFramework/Generated/Models/DataFactoryPipelineRunInfo.Serialization.cs
@@ -7,6 +7,7 @@
 
 using System.Text.Json;
 using Azure.Core;
+using Azure.Core.Expressions.DataFactory;
 
 namespace AzureDataFactory.TestingFramework.Models
 {
@@ -31,8 +32,8 @@ internal static DataFactoryPipelineRunInfo DeserializeDataFactoryPipelineRunInfo
             Optional<int> durationInMs = default;
             Optional<string> status = default;
             Optional<string> message = default;
-            IReadOnlyDictionary<string, BinaryData> additionalProperties = default;
-            Dictionary<string, BinaryData> additionalPropertiesDictionary = new Dictionary<string, BinaryData>();
+            IReadOnlyDictionary<string, DataFactoryElement<string>> additionalProperties = default;
+            Dictionary<string, DataFactoryElement<string>> additionalPropertiesDictionary = new Dictionary<string, DataFactoryElement<string>>();
             foreach (var property in element.EnumerateObject())
             {
                 if (property.NameEquals("runId"u8))
@@ -146,7 +147,7 @@ internal static DataFactoryPipelineRunInfo DeserializeDataFactoryPipelineRunInfo
                     message = property.Value.GetString();
                     continue;
                 }
-                additionalPropertiesDictionary.Add(property.Name, BinaryData.FromString(property.Value.GetRawText()));
+                additionalPropertiesDictionary.Add(property.Name, JsonSerializer.Deserialize<DataFactoryElement<string>>(property.Value.GetRawText()));
             }
             additionalProperties = additionalPropertiesDictionary;
             return new DataFactoryPipelineRunInfo(Optional.ToNullable(runId), runGroupId.Value, Optional.ToNullable(isLatest), pipelineName.Value, Optional.ToDictionary(parameters), Optional.ToDictionary(runDimensions), invokedBy.Value, Optional.ToNullable(lastUpdated), Optional.ToNullable(runStart), Optional.ToNullable(runEnd), Optional.ToNullable(durationInMs), status.Value, message.Value, additionalProperties);
diff --git a/src/AzureDataFactory.TestingFramework/Generated/Models/DataFactoryPipelineRunInfo.cs b/src/AzureDataFactory.TestingFramework/Generated/Models/DataFactoryPipelineRunInfo.cs
index 67273cca..8411e5c4 100644
--- a/src/AzureDataFactory.TestingFramework/Generated/Models/DataFactoryPipelineRunInfo.cs
+++ b/src/AzureDataFactory.TestingFramework/Generated/Models/DataFactoryPipelineRunInfo.cs
@@ -6,6 +6,7 @@
 #nullable disable
 
 using Azure.Core;
+using Azure.Core.Expressions.DataFactory;
 
 namespace AzureDataFactory.TestingFramework.Models
 {
@@ -17,7 +18,7 @@ internal DataFactoryPipelineRunInfo()
         {
             Parameters = new ChangeTrackingDictionary<string, string>();
             RunDimensions = new ChangeTrackingDictionary<string, string>();
-            AdditionalProperties = new ChangeTrackingDictionary<string, BinaryData>();
+            AdditionalProperties = new ChangeTrackingDictionary<string, DataFactoryElement<string>>();
         }
 
         /// <summary> Initializes a new instance of DataFactoryPipelineRunInfo. </summary>
@@ -35,7 +36,7 @@ internal DataFactoryPipelineRunInfo()
         /// <param name="status"> The status of a pipeline run. Possible values: Queued, InProgress, Succeeded, Failed, Canceling, Cancelled. </param>
         /// <param name="message"> The message from a pipeline run. </param>
         /// <param name="additionalProperties"> Additional Properties. </param>
-        internal DataFactoryPipelineRunInfo(Guid? runId, string runGroupId, bool? isLatest, string pipelineName, IReadOnlyDictionary<string, string> parameters, IReadOnlyDictionary<string, string> runDimensions, DataFactoryPipelineRunEntityInfo invokedBy, DateTimeOffset? lastUpdatedOn, DateTimeOffset? runStartOn, DateTimeOffset? runEndOn, int? durationInMs, string status, string message, IReadOnlyDictionary<string, BinaryData> additionalProperties)
+        internal DataFactoryPipelineRunInfo(Guid? runId, string runGroupId, bool? isLatest, string pipelineName, IReadOnlyDictionary<string, string> parameters, IReadOnlyDictionary<string, string> runDimensions, DataFactoryPipelineRunEntityInfo invokedBy, DateTimeOffset? lastUpdatedOn, DateTimeOffset? runStartOn, DateTimeOffset? runEndOn, int? durationInMs, string status, string message, IReadOnlyDictionary<string, DataFactoryElement<string>> additionalProperties)
         {
             RunId = runId;
             RunGroupId = runGroupId;
@@ -109,6 +110,6 @@ internal DataFactoryPipelineRunInfo(Guid? runId, string runGroupId, bool? isLate
         /// </list>
         /// </para>
         /// </summary>
-        public IReadOnlyDictionary<string, BinaryData> AdditionalProperties { get; }
+        public IReadOnlyDictionary<string, DataFactoryElement<string>> AdditionalProperties { get; }
     }
 }
diff --git a/src/AzureDataFactory.TestingFramework/Generated/Models/DataFactoryPrivateEndpointProperties.Serialization.cs b/src/AzureDataFactory.TestingFramework/Generated/Models/DataFactoryPrivateEndpointProperties.Serialization.cs
index d4ba6885..96e7391d 100644
--- a/src/AzureDataFactory.TestingFramework/Generated/Models/DataFactoryPrivateEndpointProperties.Serialization.cs
+++ b/src/AzureDataFactory.TestingFramework/Generated/Models/DataFactoryPrivateEndpointProperties.Serialization.cs
@@ -7,6 +7,7 @@
 
 using System.Text.Json;
 using Azure.Core;
+using Azure.Core.Expressions.DataFactory;
 
 namespace AzureDataFactory.TestingFramework.Models
 {
@@ -64,8 +65,8 @@ internal static DataFactoryPrivateEndpointProperties DeserializeDataFactoryPriva
             Optional<bool> isReserved = default;
             Optional<ResourceIdentifier> privateLinkResourceId = default;
             Optional<string> provisioningState = default;
-            IDictionary<string, BinaryData> additionalProperties = default;
-            Dictionary<string, BinaryData> additionalPropertiesDictionary = new Dictionary<string, BinaryData>();
+            IDictionary<string, DataFactoryElement<string>> additionalProperties = default;
+            Dictionary<string, DataFactoryElement<string>> additionalPropertiesDictionary = new Dictionary<string, DataFactoryElement<string>>();
             foreach (var property in element.EnumerateObject())
             {
                 if (property.NameEquals("connectionState"u8))
@@ -119,7 +120,7 @@ internal static DataFactoryPrivateEndpointProperties DeserializeDataFactoryPriva
                     provisioningState = property.Value.GetString();
                     continue;
                 }
-                additionalPropertiesDictionary.Add(property.Name, BinaryData.FromString(property.Value.GetRawText()));
+                additionalPropertiesDictionary.Add(property.Name, JsonSerializer.Deserialize<DataFactoryElement<string>>(property.Value.GetRawText()));
             }
             additionalProperties = additionalPropertiesDictionary;
             return new DataFactoryPrivateEndpointProperties(connectionState.Value, Optional.ToList(fqdns), groupId.Value, Optional.ToNullable(isReserved), privateLinkResourceId.Value, provisioningState.Value, additionalProperties);
diff --git a/src/AzureDataFactory.TestingFramework/Generated/Models/DataFactoryPrivateEndpointProperties.cs b/src/AzureDataFactory.TestingFramework/Generated/Models/DataFactoryPrivateEndpointProperties.cs
index 79618bf7..78d713f8 100644
--- a/src/AzureDataFactory.TestingFramework/Generated/Models/DataFactoryPrivateEndpointProperties.cs
+++ b/src/AzureDataFactory.TestingFramework/Generated/Models/DataFactoryPrivateEndpointProperties.cs
@@ -6,6 +6,7 @@
 #nullable disable
 
 using Azure.Core;
+using Azure.Core.Expressions.DataFactory;
 
 namespace AzureDataFactory.TestingFramework.Models
 {
@@ -16,7 +17,7 @@ public partial class DataFactoryPrivateEndpointProperties
         public DataFactoryPrivateEndpointProperties()
         {
             Fqdns = new ChangeTrackingList<string>();
-            AdditionalProperties = new ChangeTrackingDictionary<string, BinaryData>();
+            AdditionalProperties = new ChangeTrackingDictionary<string, DataFactoryElement<string>>();
         }
 
         /// <summary> Initializes a new instance of DataFactoryPrivateEndpointProperties. </summary>
@@ -27,7 +28,7 @@ public DataFactoryPrivateEndpointProperties()
         /// <param name="privateLinkResourceId"> The ARM resource ID of the resource to which the managed private endpoint is created. </param>
         /// <param name="provisioningState"> The managed private endpoint provisioning state. </param>
         /// <param name="additionalProperties"> Additional Properties. </param>
-        internal DataFactoryPrivateEndpointProperties(ConnectionStateProperties connectionState, IList<string> fqdns, string groupId, bool? isReserved, ResourceIdentifier privateLinkResourceId, string provisioningState, IDictionary<string, BinaryData> additionalProperties)
+        internal DataFactoryPrivateEndpointProperties(ConnectionStateProperties connectionState, IList<string> fqdns, string groupId, bool? isReserved, ResourceIdentifier privateLinkResourceId, string provisioningState, IDictionary<string, DataFactoryElement<string>> additionalProperties)
         {
             ConnectionState = connectionState;
             Fqdns = fqdns;
@@ -80,6 +81,6 @@ internal DataFactoryPrivateEndpointProperties(ConnectionStateProperties connecti
         /// </list>
         /// </para>
         /// </summary>
-        public IDictionary<string, BinaryData> AdditionalProperties { get; }
+        public IDictionary<string, DataFactoryElement<string>> AdditionalProperties { get; }
     }
 }
diff --git a/src/AzureDataFactory.TestingFramework/Generated/Models/DataFactoryRecurrenceSchedule.Serialization.cs b/src/AzureDataFactory.TestingFramework/Generated/Models/DataFactoryRecurrenceSchedule.Serialization.cs
index d8b37831..c8f47772 100644
--- a/src/AzureDataFactory.TestingFramework/Generated/Models/DataFactoryRecurrenceSchedule.Serialization.cs
+++ b/src/AzureDataFactory.TestingFramework/Generated/Models/DataFactoryRecurrenceSchedule.Serialization.cs
@@ -7,6 +7,7 @@
 
 using System.Text.Json;
 using Azure.Core;
+using Azure.Core.Expressions.DataFactory;
 
 namespace AzureDataFactory.TestingFramework.Models
 {
@@ -88,8 +89,8 @@ internal static DataFactoryRecurrenceSchedule DeserializeDataFactoryRecurrenceSc
             Optional<IList<DataFactoryDayOfWeek>> weekDays = default;
             Optional<IList<int>> monthDays = default;
             Optional<IList<DataFactoryRecurrenceScheduleOccurrence>> monthlyOccurrences = default;
-            IDictionary<string, BinaryData> additionalProperties = default;
-            Dictionary<string, BinaryData> additionalPropertiesDictionary = new Dictionary<string, BinaryData>();
+            IDictionary<string, DataFactoryElement<string>> additionalProperties = default;
+            Dictionary<string, DataFactoryElement<string>> additionalPropertiesDictionary = new Dictionary<string, DataFactoryElement<string>>();
             foreach (var property in element.EnumerateObject())
             {
                 if (property.NameEquals("minutes"u8))
@@ -162,7 +163,7 @@ internal static DataFactoryRecurrenceSchedule DeserializeDataFactoryRecurrenceSc
                     monthlyOccurrences = array;
                     continue;
                 }
-                additionalPropertiesDictionary.Add(property.Name, BinaryData.FromString(property.Value.GetRawText()));
+                additionalPropertiesDictionary.Add(property.Name, JsonSerializer.Deserialize<DataFactoryElement<string>>(property.Value.GetRawText()));
             }
             additionalProperties = additionalPropertiesDictionary;
             return new DataFactoryRecurrenceSchedule(Optional.ToList(minutes), Optional.ToList(hours), Optional.ToList(weekDays), Optional.ToList(monthDays), Optional.ToList(monthlyOccurrences), additionalProperties);
diff --git a/src/AzureDataFactory.TestingFramework/Generated/Models/DataFactoryRecurrenceSchedule.cs b/src/AzureDataFactory.TestingFramework/Generated/Models/DataFactoryRecurrenceSchedule.cs
index a6b76986..b9c42270 100644
--- a/src/AzureDataFactory.TestingFramework/Generated/Models/DataFactoryRecurrenceSchedule.cs
+++ b/src/AzureDataFactory.TestingFramework/Generated/Models/DataFactoryRecurrenceSchedule.cs
@@ -6,6 +6,7 @@
 #nullable disable
 
 using Azure.Core;
+using Azure.Core.Expressions.DataFactory;
 
 namespace AzureDataFactory.TestingFramework.Models
 {
@@ -20,7 +21,7 @@ public DataFactoryRecurrenceSchedule()
             WeekDays = new ChangeTrackingList<DataFactoryDayOfWeek>();
             MonthDays = new ChangeTrackingList<int>();
             MonthlyOccurrences = new ChangeTrackingList<DataFactoryRecurrenceScheduleOccurrence>();
-            AdditionalProperties = new ChangeTrackingDictionary<string, BinaryData>();
+            AdditionalProperties = new ChangeTrackingDictionary<string, DataFactoryElement<string>>();
         }
 
         /// <summary> Initializes a new instance of DataFactoryRecurrenceSchedule. </summary>
@@ -30,7 +31,7 @@ public DataFactoryRecurrenceSchedule()
         /// <param name="monthDays"> The month days. </param>
         /// <param name="monthlyOccurrences"> The monthly occurrences. </param>
         /// <param name="additionalProperties"> Additional Properties. </param>
-        internal DataFactoryRecurrenceSchedule(IList<int> minutes, IList<int> hours, IList<DataFactoryDayOfWeek> weekDays, IList<int> monthDays, IList<DataFactoryRecurrenceScheduleOccurrence> monthlyOccurrences, IDictionary<string, BinaryData> additionalProperties)
+        internal DataFactoryRecurrenceSchedule(IList<int> minutes, IList<int> hours, IList<DataFactoryDayOfWeek> weekDays, IList<int> monthDays, IList<DataFactoryRecurrenceScheduleOccurrence> monthlyOccurrences, IDictionary<string, DataFactoryElement<string>> additionalProperties)
         {
             Minutes = minutes;
             Hours = hours;
@@ -80,6 +81,6 @@ internal DataFactoryRecurrenceSchedule(IList<int> minutes, IList<int> hours, ILi
         /// </list>
         /// </para>
         /// </summary>
-        public IDictionary<string, BinaryData> AdditionalProperties { get; }
+        public IDictionary<string, DataFactoryElement<string>> AdditionalProperties { get; }
     }
 }
diff --git a/src/AzureDataFactory.TestingFramework/Generated/Models/DataFactoryRecurrenceScheduleOccurrence.Serialization.cs b/src/AzureDataFactory.TestingFramework/Generated/Models/DataFactoryRecurrenceScheduleOccurrence.Serialization.cs
index 1244e2eb..f3e8b26d 100644
--- a/src/AzureDataFactory.TestingFramework/Generated/Models/DataFactoryRecurrenceScheduleOccurrence.Serialization.cs
+++ b/src/AzureDataFactory.TestingFramework/Generated/Models/DataFactoryRecurrenceScheduleOccurrence.Serialization.cs
@@ -7,6 +7,7 @@
 
 using System.Text.Json;
 using Azure.Core;
+using Azure.Core.Expressions.DataFactory;
 
 namespace AzureDataFactory.TestingFramework.Models
 {
@@ -45,8 +46,8 @@ internal static DataFactoryRecurrenceScheduleOccurrence DeserializeDataFactoryRe
             }
             Optional<DataFactoryDayOfWeek> day = default;
             Optional<int> occurrence = default;
-            IDictionary<string, BinaryData> additionalProperties = default;
-            Dictionary<string, BinaryData> additionalPropertiesDictionary = new Dictionary<string, BinaryData>();
+            IDictionary<string, DataFactoryElement<string>> additionalProperties = default;
+            Dictionary<string, DataFactoryElement<string>> additionalPropertiesDictionary = new Dictionary<string, DataFactoryElement<string>>();
             foreach (var property in element.EnumerateObject())
             {
                 if (property.NameEquals("day"u8))
@@ -67,7 +68,7 @@ internal static DataFactoryRecurrenceScheduleOccurrence DeserializeDataFactoryRe
                     occurrence = property.Value.GetInt32();
                     continue;
                 }
-                additionalPropertiesDictionary.Add(property.Name, BinaryData.FromString(property.Value.GetRawText()));
+                additionalPropertiesDictionary.Add(property.Name, JsonSerializer.Deserialize<DataFactoryElement<string>>(property.Value.GetRawText()));
             }
             additionalProperties = additionalPropertiesDictionary;
             return new DataFactoryRecurrenceScheduleOccurrence(Optional.ToNullable(day), Optional.ToNullable(occurrence), additionalProperties);
diff --git a/src/AzureDataFactory.TestingFramework/Generated/Models/DataFactoryRecurrenceScheduleOccurrence.cs b/src/AzureDataFactory.TestingFramework/Generated/Models/DataFactoryRecurrenceScheduleOccurrence.cs
index b093f1f6..b9a0af02 100644
--- a/src/AzureDataFactory.TestingFramework/Generated/Models/DataFactoryRecurrenceScheduleOccurrence.cs
+++ b/src/AzureDataFactory.TestingFramework/Generated/Models/DataFactoryRecurrenceScheduleOccurrence.cs
@@ -6,6 +6,7 @@
 #nullable disable
 
 using Azure.Core;
+using Azure.Core.Expressions.DataFactory;
 
 namespace AzureDataFactory.TestingFramework.Models
 {
@@ -15,14 +16,14 @@ public partial class DataFactoryRecurrenceScheduleOccurrence
         /// <summary> Initializes a new instance of DataFactoryRecurrenceScheduleOccurrence. </summary>
         public DataFactoryRecurrenceScheduleOccurrence()
         {
-            AdditionalProperties = new ChangeTrackingDictionary<string, BinaryData>();
+            AdditionalProperties = new ChangeTrackingDictionary<string, DataFactoryElement<string>>();
         }
 
         /// <summary> Initializes a new instance of DataFactoryRecurrenceScheduleOccurrence. </summary>
         /// <param name="day"> The day of the week. </param>
         /// <param name="occurrence"> The occurrence. </param>
         /// <param name="additionalProperties"> Additional Properties. </param>
-        internal DataFactoryRecurrenceScheduleOccurrence(DataFactoryDayOfWeek? day, int? occurrence, IDictionary<string, BinaryData> additionalProperties)
+        internal DataFactoryRecurrenceScheduleOccurrence(DataFactoryDayOfWeek? day, int? occurrence, IDictionary<string, DataFactoryElement<string>> additionalProperties)
         {
             Day = day;
             Occurrence = occurrence;
@@ -63,6 +64,6 @@ internal DataFactoryRecurrenceScheduleOccurrence(DataFactoryDayOfWeek? day, int?
         /// </list>
         /// </para>
         /// </summary>
-        public IDictionary<string, BinaryData> AdditionalProperties { get; }
+        public IDictionary<string, DataFactoryElement<string>> AdditionalProperties { get; }
     }
 }
diff --git a/src/AzureDataFactory.TestingFramework/Generated/Models/DataFactoryScheduleTrigger.Serialization.cs b/src/AzureDataFactory.TestingFramework/Generated/Models/DataFactoryScheduleTrigger.Serialization.cs
index c0669171..094fbcd0 100644
--- a/src/AzureDataFactory.TestingFramework/Generated/Models/DataFactoryScheduleTrigger.Serialization.cs
+++ b/src/AzureDataFactory.TestingFramework/Generated/Models/DataFactoryScheduleTrigger.Serialization.cs
@@ -7,6 +7,7 @@
 
 using System.Text.Json;
 using Azure.Core;
+using Azure.Core.Expressions.DataFactory;
 
 namespace AzureDataFactory.TestingFramework.Models
 {
@@ -80,8 +81,8 @@ internal static DataFactoryScheduleTrigger DeserializeDataFactoryScheduleTrigger
             Optional<DataFactoryTriggerRuntimeState> runtimeState = default;
             Optional<IList<BinaryData>> annotations = default;
             ScheduleTriggerRecurrence recurrence = default;
-            IDictionary<string, BinaryData> additionalProperties = default;
-            Dictionary<string, BinaryData> additionalPropertiesDictionary = new Dictionary<string, BinaryData>();
+            IDictionary<string, DataFactoryElement<string>> additionalProperties = default;
+            Dictionary<string, DataFactoryElement<string>> additionalPropertiesDictionary = new Dictionary<string, DataFactoryElement<string>>();
             foreach (var property in element.EnumerateObject())
             {
                 if (property.NameEquals("pipelines"u8))
@@ -155,7 +156,7 @@ internal static DataFactoryScheduleTrigger DeserializeDataFactoryScheduleTrigger
                     }
                     continue;
                 }
-                additionalPropertiesDictionary.Add(property.Name, BinaryData.FromString(property.Value.GetRawText()));
+                additionalPropertiesDictionary.Add(property.Name, JsonSerializer.Deserialize<DataFactoryElement<string>>(property.Value.GetRawText()));
             }
             additionalProperties = additionalPropertiesDictionary;
             return new DataFactoryScheduleTrigger(type, description.Value, Optional.ToNullable(runtimeState), Optional.ToList(annotations), additionalProperties, Optional.ToList(pipelines), recurrence);
diff --git a/src/AzureDataFactory.TestingFramework/Generated/Models/DataFactoryScheduleTrigger.cs b/src/AzureDataFactory.TestingFramework/Generated/Models/DataFactoryScheduleTrigger.cs
index 7690bb3e..cbf2876e 100644
--- a/src/AzureDataFactory.TestingFramework/Generated/Models/DataFactoryScheduleTrigger.cs
+++ b/src/AzureDataFactory.TestingFramework/Generated/Models/DataFactoryScheduleTrigger.cs
@@ -6,6 +6,7 @@
 #nullable disable
 
 using Azure.Core;
+using Azure.Core.Expressions.DataFactory;
 
 namespace AzureDataFactory.TestingFramework.Models
 {
@@ -31,7 +32,7 @@ public DataFactoryScheduleTrigger(ScheduleTriggerRecurrence recurrence)
         /// <param name="additionalProperties"> Additional Properties. </param>
         /// <param name="pipelines"> Pipelines that need to be started. </param>
         /// <param name="recurrence"> Recurrence schedule configuration. </param>
-        internal DataFactoryScheduleTrigger(string triggerType, string description, DataFactoryTriggerRuntimeState? runtimeState, IList<BinaryData> annotations, IDictionary<string, BinaryData> additionalProperties, IList<TriggerPipelineReference> pipelines, ScheduleTriggerRecurrence recurrence) : base(triggerType, description, runtimeState, annotations, additionalProperties, pipelines)
+        internal DataFactoryScheduleTrigger(string triggerType, string description, DataFactoryTriggerRuntimeState? runtimeState, IList<BinaryData> annotations, IDictionary<string, DataFactoryElement<string>> additionalProperties, IList<TriggerPipelineReference> pipelines, ScheduleTriggerRecurrence recurrence) : base(triggerType, description, runtimeState, annotations, additionalProperties, pipelines)
         {
             Recurrence = recurrence;
             TriggerType = triggerType ?? "ScheduleTrigger";
diff --git a/src/AzureDataFactory.TestingFramework/Generated/Models/DataFactoryScriptActivity.Serialization.cs b/src/AzureDataFactory.TestingFramework/Generated/Models/DataFactoryScriptActivity.Serialization.cs
index 008fa072..5fca4933 100644
--- a/src/AzureDataFactory.TestingFramework/Generated/Models/DataFactoryScriptActivity.Serialization.cs
+++ b/src/AzureDataFactory.TestingFramework/Generated/Models/DataFactoryScriptActivity.Serialization.cs
@@ -118,8 +118,8 @@ internal static DataFactoryScriptActivity DeserializeDataFactoryScriptActivity(J
             Optional<DataFactoryElement<string>> scriptBlockExecutionTimeout = default;
             Optional<IList<ScriptActivityScriptBlock>> scripts = default;
             Optional<ScriptActivityTypeLogSettings> logSettings = default;
-            IDictionary<string, BinaryData> additionalProperties = default;
-            Dictionary<string, BinaryData> additionalPropertiesDictionary = new Dictionary<string, BinaryData>();
+            IDictionary<string, DataFactoryElement<string>> additionalProperties = default;
+            Dictionary<string, DataFactoryElement<string>> additionalPropertiesDictionary = new Dictionary<string, DataFactoryElement<string>>();
             foreach (var property in element.EnumerateObject())
             {
                 if (property.NameEquals("linkedServiceName"u8))
@@ -245,7 +245,7 @@ internal static DataFactoryScriptActivity DeserializeDataFactoryScriptActivity(J
                     }
                     continue;
                 }
-                additionalPropertiesDictionary.Add(property.Name, BinaryData.FromString(property.Value.GetRawText()));
+                additionalPropertiesDictionary.Add(property.Name, JsonSerializer.Deserialize<DataFactoryElement<string>>(property.Value.GetRawText()));
             }
             additionalProperties = additionalPropertiesDictionary;
             return new DataFactoryScriptActivity(name, type, description.Value, Optional.ToNullable(state), Optional.ToNullable(onInactiveMarkAs), Optional.ToList(dependsOn), Optional.ToList(userProperties), additionalProperties, linkedServiceName, policy.Value, scriptBlockExecutionTimeout.Value, Optional.ToList(scripts), logSettings.Value);
diff --git a/src/AzureDataFactory.TestingFramework/Generated/Models/DataFactoryScriptActivity.cs b/src/AzureDataFactory.TestingFramework/Generated/Models/DataFactoryScriptActivity.cs
index d1ca8b6f..89180969 100644
--- a/src/AzureDataFactory.TestingFramework/Generated/Models/DataFactoryScriptActivity.cs
+++ b/src/AzureDataFactory.TestingFramework/Generated/Models/DataFactoryScriptActivity.cs
@@ -38,7 +38,7 @@ public DataFactoryScriptActivity(string name) : base(name)
         /// <param name="scriptBlockExecutionTimeout"> ScriptBlock execution timeout. Type: string (or Expression with resultType string), pattern: ((\d+)\.)?(\d\d):(60|([0-5][0-9])):(60|([0-5][0-9])). </param>
         /// <param name="scripts"> Array of script blocks. Type: array. </param>
         /// <param name="logSettings"> Log settings of script activity. </param>
-        internal DataFactoryScriptActivity(string name, string activityType, string description, PipelineActivityState? state, ActivityOnInactiveMarkAs? onInactiveMarkAs, IList<PipelineActivityDependency> dependsOn, IList<PipelineActivityUserProperty> userProperties, IDictionary<string, BinaryData> additionalProperties, DataFactoryLinkedServiceReference linkedServiceName, PipelineActivityPolicy policy, DataFactoryElement<string> scriptBlockExecutionTimeout, IList<ScriptActivityScriptBlock> scripts, ScriptActivityTypeLogSettings logSettings) : base(name, activityType, description, state, onInactiveMarkAs, dependsOn, userProperties, additionalProperties, linkedServiceName, policy)
+        internal DataFactoryScriptActivity(string name, string activityType, string description, PipelineActivityState? state, ActivityOnInactiveMarkAs? onInactiveMarkAs, IList<PipelineActivityDependency> dependsOn, IList<PipelineActivityUserProperty> userProperties, IDictionary<string, DataFactoryElement<string>> additionalProperties, DataFactoryLinkedServiceReference linkedServiceName, PipelineActivityPolicy policy, DataFactoryElement<string> scriptBlockExecutionTimeout, IList<ScriptActivityScriptBlock> scripts, ScriptActivityTypeLogSettings logSettings) : base(name, activityType, description, state, onInactiveMarkAs, dependsOn, userProperties, additionalProperties, linkedServiceName, policy)
         {
             ScriptBlockExecutionTimeout = scriptBlockExecutionTimeout;
             Scripts = scripts;
diff --git a/src/AzureDataFactory.TestingFramework/Generated/Models/DataFactoryTriggerProperties.cs b/src/AzureDataFactory.TestingFramework/Generated/Models/DataFactoryTriggerProperties.cs
index 3ea97e0f..669754ff 100644
--- a/src/AzureDataFactory.TestingFramework/Generated/Models/DataFactoryTriggerProperties.cs
+++ b/src/AzureDataFactory.TestingFramework/Generated/Models/DataFactoryTriggerProperties.cs
@@ -6,6 +6,7 @@
 #nullable disable
 
 using Azure.Core;
+using Azure.Core.Expressions.DataFactory;
 
 namespace AzureDataFactory.TestingFramework.Models
 {
@@ -20,7 +21,7 @@ public partial class DataFactoryTriggerProperties
         public DataFactoryTriggerProperties()
         {
             Annotations = new ChangeTrackingList<BinaryData>();
-            AdditionalProperties = new ChangeTrackingDictionary<string, BinaryData>();
+            AdditionalProperties = new ChangeTrackingDictionary<string, DataFactoryElement<string>>();
         }
 
         /// <summary> Initializes a new instance of DataFactoryTriggerProperties. </summary>
@@ -29,7 +30,7 @@ public DataFactoryTriggerProperties()
         /// <param name="runtimeState"> Indicates if trigger is running or not. Updated when Start/Stop APIs are called on the Trigger. </param>
         /// <param name="annotations"> List of tags that can be used for describing the trigger. </param>
         /// <param name="additionalProperties"> Additional Properties. </param>
-        internal DataFactoryTriggerProperties(string triggerType, string description, DataFactoryTriggerRuntimeState? runtimeState, IList<BinaryData> annotations, IDictionary<string, BinaryData> additionalProperties)
+        internal DataFactoryTriggerProperties(string triggerType, string description, DataFactoryTriggerRuntimeState? runtimeState, IList<BinaryData> annotations, IDictionary<string, DataFactoryElement<string>> additionalProperties)
         {
             TriggerType = triggerType;
             Description = description;
@@ -105,6 +106,6 @@ internal DataFactoryTriggerProperties(string triggerType, string description, Da
         /// </list>
         /// </para>
         /// </summary>
-        public IDictionary<string, BinaryData> AdditionalProperties { get; }
+        public IDictionary<string, DataFactoryElement<string>> AdditionalProperties { get; }
     }
 }
diff --git a/src/AzureDataFactory.TestingFramework/Generated/Models/DataFactoryTriggerRun.Serialization.cs b/src/AzureDataFactory.TestingFramework/Generated/Models/DataFactoryTriggerRun.Serialization.cs
index 614b7621..89f58560 100644
--- a/src/AzureDataFactory.TestingFramework/Generated/Models/DataFactoryTriggerRun.Serialization.cs
+++ b/src/AzureDataFactory.TestingFramework/Generated/Models/DataFactoryTriggerRun.Serialization.cs
@@ -7,6 +7,7 @@
 
 using System.Text.Json;
 using Azure.Core;
+using Azure.Core.Expressions.DataFactory;
 
 namespace AzureDataFactory.TestingFramework.Models
 {
@@ -27,9 +28,9 @@ internal static DataFactoryTriggerRun DeserializeDataFactoryTriggerRun(JsonEleme
             Optional<IReadOnlyDictionary<string, string>> properties = default;
             Optional<IReadOnlyDictionary<string, string>> triggeredPipelines = default;
             Optional<IReadOnlyDictionary<string, string>> runDimension = default;
-            Optional<IReadOnlyDictionary<string, BinaryData>> dependencyStatus = default;
-            IReadOnlyDictionary<string, BinaryData> additionalProperties = default;
-            Dictionary<string, BinaryData> additionalPropertiesDictionary = new Dictionary<string, BinaryData>();
+            Optional<IReadOnlyDictionary<string, DataFactoryElement<string>>> dependencyStatus = default;
+            IReadOnlyDictionary<string, DataFactoryElement<string>> additionalProperties = default;
+            Dictionary<string, DataFactoryElement<string>> additionalPropertiesDictionary = new Dictionary<string, DataFactoryElement<string>>();
             foreach (var property in element.EnumerateObject())
             {
                 if (property.NameEquals("triggerRunId"u8))
@@ -118,7 +119,7 @@ internal static DataFactoryTriggerRun DeserializeDataFactoryTriggerRun(JsonEleme
                     {
                         continue;
                     }
-                    Dictionary<string, BinaryData> dictionary = new Dictionary<string, BinaryData>();
+                    Dictionary<string, DataFactoryElement<string>> dictionary = new Dictionary<string, DataFactoryElement<string>>();
                     foreach (var property0 in property.Value.EnumerateObject())
                     {
                         if (property0.Value.ValueKind == JsonValueKind.Null)
@@ -127,13 +128,13 @@ internal static DataFactoryTriggerRun DeserializeDataFactoryTriggerRun(JsonEleme
                         }
                         else
                         {
-                            dictionary.Add(property0.Name, BinaryData.FromString(property0.Value.GetRawText()));
+                            dictionary.Add(property0.Name, JsonSerializer.Deserialize<DataFactoryElement<string>>(property0.Value.GetRawText()));
                         }
                     }
                     dependencyStatus = dictionary;
                     continue;
                 }
-                additionalPropertiesDictionary.Add(property.Name, BinaryData.FromString(property.Value.GetRawText()));
+                additionalPropertiesDictionary.Add(property.Name, JsonSerializer.Deserialize<DataFactoryElement<string>>(property.Value.GetRawText()));
             }
             additionalProperties = additionalPropertiesDictionary;
             return new DataFactoryTriggerRun(triggerRunId.Value, triggerName.Value, triggerType.Value, Optional.ToNullable(triggerRunTimestamp), Optional.ToNullable(status), message.Value, Optional.ToDictionary(properties), Optional.ToDictionary(triggeredPipelines), Optional.ToDictionary(runDimension), Optional.ToDictionary(dependencyStatus), additionalProperties);
diff --git a/src/AzureDataFactory.TestingFramework/Generated/Models/DataFactoryTriggerRun.cs b/src/AzureDataFactory.TestingFramework/Generated/Models/DataFactoryTriggerRun.cs
index f83ff7de..d2273f22 100644
--- a/src/AzureDataFactory.TestingFramework/Generated/Models/DataFactoryTriggerRun.cs
+++ b/src/AzureDataFactory.TestingFramework/Generated/Models/DataFactoryTriggerRun.cs
@@ -6,6 +6,7 @@
 #nullable disable
 
 using Azure.Core;
+using Azure.Core.Expressions.DataFactory;
 
 namespace AzureDataFactory.TestingFramework.Models
 {
@@ -18,8 +19,8 @@ internal DataFactoryTriggerRun()
             Properties = new ChangeTrackingDictionary<string, string>();
             TriggeredPipelines = new ChangeTrackingDictionary<string, string>();
             RunDimension = new ChangeTrackingDictionary<string, string>();
-            DependencyStatus = new ChangeTrackingDictionary<string, BinaryData>();
-            AdditionalProperties = new ChangeTrackingDictionary<string, BinaryData>();
+            DependencyStatus = new ChangeTrackingDictionary<string, DataFactoryElement<string>>();
+            AdditionalProperties = new ChangeTrackingDictionary<string, DataFactoryElement<string>>();
         }
 
         /// <summary> Initializes a new instance of DataFactoryTriggerRun. </summary>
@@ -34,7 +35,7 @@ internal DataFactoryTriggerRun()
         /// <param name="runDimension"> Run dimension for which trigger was fired. </param>
         /// <param name="dependencyStatus"> Status of the upstream pipelines. </param>
         /// <param name="additionalProperties"> Additional Properties. </param>
-        internal DataFactoryTriggerRun(string triggerRunId, string triggerName, string triggerType, DateTimeOffset? triggerRunTimestamp, DataFactoryTriggerRunStatus? status, string message, IReadOnlyDictionary<string, string> properties, IReadOnlyDictionary<string, string> triggeredPipelines, IReadOnlyDictionary<string, string> runDimension, IReadOnlyDictionary<string, BinaryData> dependencyStatus, IReadOnlyDictionary<string, BinaryData> additionalProperties)
+        internal DataFactoryTriggerRun(string triggerRunId, string triggerName, string triggerType, DateTimeOffset? triggerRunTimestamp, DataFactoryTriggerRunStatus? status, string message, IReadOnlyDictionary<string, string> properties, IReadOnlyDictionary<string, string> triggeredPipelines, IReadOnlyDictionary<string, string> runDimension, IReadOnlyDictionary<string, DataFactoryElement<string>> dependencyStatus, IReadOnlyDictionary<string, DataFactoryElement<string>> additionalProperties)
         {
             TriggerRunId = triggerRunId;
             TriggerName = triggerName;
@@ -97,7 +98,7 @@ internal DataFactoryTriggerRun(string triggerRunId, string triggerName, string t
         /// </list>
         /// </para>
         /// </summary>
-        public IReadOnlyDictionary<string, BinaryData> DependencyStatus { get; }
+        public IReadOnlyDictionary<string, DataFactoryElement<string>> DependencyStatus { get; }
         /// <summary>
         /// Additional Properties
         /// <para>
@@ -128,6 +129,6 @@ internal DataFactoryTriggerRun(string triggerRunId, string triggerName, string t
         /// </list>
         /// </para>
         /// </summary>
-        public IReadOnlyDictionary<string, BinaryData> AdditionalProperties { get; }
+        public IReadOnlyDictionary<string, DataFactoryElement<string>> AdditionalProperties { get; }
     }
 }
diff --git a/src/AzureDataFactory.TestingFramework/Generated/Models/DataFlowDebugPackageDebugSettings.cs b/src/AzureDataFactory.TestingFramework/Generated/Models/DataFlowDebugPackageDebugSettings.cs
index b417b859..22c5fe8c 100644
--- a/src/AzureDataFactory.TestingFramework/Generated/Models/DataFlowDebugPackageDebugSettings.cs
+++ b/src/AzureDataFactory.TestingFramework/Generated/Models/DataFlowDebugPackageDebugSettings.cs
@@ -6,6 +6,7 @@
 #nullable disable
 
 using Azure.Core;
+using Azure.Core.Expressions.DataFactory;
 
 namespace AzureDataFactory.TestingFramework.Models
 {
@@ -16,7 +17,7 @@ public partial class DataFlowDebugPackageDebugSettings
         public DataFlowDebugPackageDebugSettings()
         {
             SourceSettings = new ChangeTrackingList<DataFlowSourceSetting>();
-            Parameters = new ChangeTrackingDictionary<string, BinaryData>();
+            Parameters = new ChangeTrackingDictionary<string, DataFactoryElement<string>>();
         }
 
         /// <summary> Source setting for data flow debug. </summary>
@@ -51,7 +52,7 @@ public DataFlowDebugPackageDebugSettings()
         /// </list>
         /// </para>
         /// </summary>
-        public IDictionary<string, BinaryData> Parameters { get; }
+        public IDictionary<string, DataFactoryElement<string>> Parameters { get; }
         /// <summary>
         /// Parameters for dataset.
         /// <para>
diff --git a/src/AzureDataFactory.TestingFramework/Generated/Models/DataFlowDebugSessionInfo.Serialization.cs b/src/AzureDataFactory.TestingFramework/Generated/Models/DataFlowDebugSessionInfo.Serialization.cs
index a52b7795..e0a16eff 100644
--- a/src/AzureDataFactory.TestingFramework/Generated/Models/DataFlowDebugSessionInfo.Serialization.cs
+++ b/src/AzureDataFactory.TestingFramework/Generated/Models/DataFlowDebugSessionInfo.Serialization.cs
@@ -7,6 +7,7 @@
 
 using System.Text.Json;
 using Azure.Core;
+using Azure.Core.Expressions.DataFactory;
 
 namespace AzureDataFactory.TestingFramework.Models
 {
@@ -27,8 +28,8 @@ internal static DataFlowDebugSessionInfo DeserializeDataFlowDebugSessionInfo(Jso
             Optional<DateTimeOffset> startTime = default;
             Optional<int> timeToLiveInMinutes = default;
             Optional<DateTimeOffset> lastActivityTime = default;
-            IReadOnlyDictionary<string, BinaryData> additionalProperties = default;
-            Dictionary<string, BinaryData> additionalPropertiesDictionary = new Dictionary<string, BinaryData>();
+            IReadOnlyDictionary<string, DataFactoryElement<string>> additionalProperties = default;
+            Dictionary<string, DataFactoryElement<string>> additionalPropertiesDictionary = new Dictionary<string, DataFactoryElement<string>>();
             foreach (var property in element.EnumerateObject())
             {
                 if (property.NameEquals("dataFlowName"u8))
@@ -100,7 +101,7 @@ internal static DataFlowDebugSessionInfo DeserializeDataFlowDebugSessionInfo(Jso
                     lastActivityTime = property.Value.GetDateTimeOffset("O");
                     continue;
                 }
-                additionalPropertiesDictionary.Add(property.Name, BinaryData.FromString(property.Value.GetRawText()));
+                additionalPropertiesDictionary.Add(property.Name, JsonSerializer.Deserialize<DataFactoryElement<string>>(property.Value.GetRawText()));
             }
             additionalProperties = additionalPropertiesDictionary;
             return new DataFlowDebugSessionInfo(dataFlowName.Value, computeType.Value, Optional.ToNullable(coreCount), Optional.ToNullable(nodeCount), integrationRuntimeName.Value, Optional.ToNullable(sessionId), Optional.ToNullable(startTime), Optional.ToNullable(timeToLiveInMinutes), Optional.ToNullable(lastActivityTime), additionalProperties);
diff --git a/src/AzureDataFactory.TestingFramework/Generated/Models/DataFlowDebugSessionInfo.cs b/src/AzureDataFactory.TestingFramework/Generated/Models/DataFlowDebugSessionInfo.cs
index 4fe4c5a0..9c6a1c04 100644
--- a/src/AzureDataFactory.TestingFramework/Generated/Models/DataFlowDebugSessionInfo.cs
+++ b/src/AzureDataFactory.TestingFramework/Generated/Models/DataFlowDebugSessionInfo.cs
@@ -6,6 +6,7 @@
 #nullable disable
 
 using Azure.Core;
+using Azure.Core.Expressions.DataFactory;
 
 namespace AzureDataFactory.TestingFramework.Models
 {
@@ -15,7 +16,7 @@ public partial class DataFlowDebugSessionInfo
         /// <summary> Initializes a new instance of DataFlowDebugSessionInfo. </summary>
         internal DataFlowDebugSessionInfo()
         {
-            AdditionalProperties = new ChangeTrackingDictionary<string, BinaryData>();
+            AdditionalProperties = new ChangeTrackingDictionary<string, DataFactoryElement<string>>();
         }
 
         /// <summary> Initializes a new instance of DataFlowDebugSessionInfo. </summary>
@@ -29,7 +30,7 @@ internal DataFlowDebugSessionInfo()
         /// <param name="timeToLiveInMinutes"> Compute type of the cluster. </param>
         /// <param name="lastActivityOn"> Last activity time of data flow debug session. </param>
         /// <param name="additionalProperties"> Additional Properties. </param>
-        internal DataFlowDebugSessionInfo(string dataFlowName, string computeType, int? coreCount, int? nodeCount, string integrationRuntimeName, Guid? sessionId, DateTimeOffset? startOn, int? timeToLiveInMinutes, DateTimeOffset? lastActivityOn, IReadOnlyDictionary<string, BinaryData> additionalProperties)
+        internal DataFlowDebugSessionInfo(string dataFlowName, string computeType, int? coreCount, int? nodeCount, string integrationRuntimeName, Guid? sessionId, DateTimeOffset? startOn, int? timeToLiveInMinutes, DateTimeOffset? lastActivityOn, IReadOnlyDictionary<string, DataFactoryElement<string>> additionalProperties)
         {
             DataFlowName = dataFlowName;
             ComputeType = computeType;
@@ -91,6 +92,6 @@ internal DataFlowDebugSessionInfo(string dataFlowName, string computeType, int?
         /// </list>
         /// </para>
         /// </summary>
-        public IReadOnlyDictionary<string, BinaryData> AdditionalProperties { get; }
+        public IReadOnlyDictionary<string, DataFactoryElement<string>> AdditionalProperties { get; }
     }
 }
diff --git a/src/AzureDataFactory.TestingFramework/Generated/Models/DataFlowReference.Serialization.cs b/src/AzureDataFactory.TestingFramework/Generated/Models/DataFlowReference.Serialization.cs
index 8f805d77..9044acf0 100644
--- a/src/AzureDataFactory.TestingFramework/Generated/Models/DataFlowReference.Serialization.cs
+++ b/src/AzureDataFactory.TestingFramework/Generated/Models/DataFlowReference.Serialization.cs
@@ -7,6 +7,7 @@
 
 using System.Text.Json;
 using Azure.Core;
+using Azure.Core.Expressions.DataFactory;
 
 namespace AzureDataFactory.TestingFramework.Models
 {
@@ -69,9 +70,9 @@ internal static DataFlowReference DeserializeDataFlowReference(JsonElement eleme
             DataFlowReferenceType type = default;
             string referenceName = default;
             Optional<BinaryData> datasetParameters = default;
-            Optional<IDictionary<string, BinaryData>> parameters = default;
-            IDictionary<string, BinaryData> additionalProperties = default;
-            Dictionary<string, BinaryData> additionalPropertiesDictionary = new Dictionary<string, BinaryData>();
+            Optional<IDictionary<string, DataFactoryElement<string>>> parameters = default;
+            IDictionary<string, DataFactoryElement<string>> additionalProperties = default;
+            Dictionary<string, DataFactoryElement<string>> additionalPropertiesDictionary = new Dictionary<string, DataFactoryElement<string>>();
             foreach (var property in element.EnumerateObject())
             {
                 if (property.NameEquals("type"u8))
@@ -99,7 +100,7 @@ internal static DataFlowReference DeserializeDataFlowReference(JsonElement eleme
                     {
                         continue;
                     }
-                    Dictionary<string, BinaryData> dictionary = new Dictionary<string, BinaryData>();
+                    Dictionary<string, DataFactoryElement<string>> dictionary = new Dictionary<string, DataFactoryElement<string>>();
                     foreach (var property0 in property.Value.EnumerateObject())
                     {
                         if (property0.Value.ValueKind == JsonValueKind.Null)
@@ -108,13 +109,13 @@ internal static DataFlowReference DeserializeDataFlowReference(JsonElement eleme
                         }
                         else
                         {
-                            dictionary.Add(property0.Name, BinaryData.FromString(property0.Value.GetRawText()));
+                            dictionary.Add(property0.Name, JsonSerializer.Deserialize<DataFactoryElement<string>>(property0.Value.GetRawText()));
                         }
                     }
                     parameters = dictionary;
                     continue;
                 }
-                additionalPropertiesDictionary.Add(property.Name, BinaryData.FromString(property.Value.GetRawText()));
+                additionalPropertiesDictionary.Add(property.Name, JsonSerializer.Deserialize<DataFactoryElement<string>>(property.Value.GetRawText()));
             }
             additionalProperties = additionalPropertiesDictionary;
             return new DataFlowReference(type, referenceName, datasetParameters.Value, Optional.ToDictionary(parameters), additionalProperties);
diff --git a/src/AzureDataFactory.TestingFramework/Generated/Models/DataFlowReference.cs b/src/AzureDataFactory.TestingFramework/Generated/Models/DataFlowReference.cs
index dc6b9a04..965ca861 100644
--- a/src/AzureDataFactory.TestingFramework/Generated/Models/DataFlowReference.cs
+++ b/src/AzureDataFactory.TestingFramework/Generated/Models/DataFlowReference.cs
@@ -6,6 +6,7 @@
 #nullable disable
 
 using Azure.Core;
+using Azure.Core.Expressions.DataFactory;
 
 namespace AzureDataFactory.TestingFramework.Models
 {
@@ -22,8 +23,8 @@ public DataFlowReference(DataFlowReferenceType referenceType, string referenceNa
 
             ReferenceType = referenceType;
             ReferenceName = referenceName;
-            Parameters = new ChangeTrackingDictionary<string, BinaryData>();
-            AdditionalProperties = new ChangeTrackingDictionary<string, BinaryData>();
+            Parameters = new ChangeTrackingDictionary<string, DataFactoryElement<string>>();
+            AdditionalProperties = new ChangeTrackingDictionary<string, DataFactoryElement<string>>();
         }
 
         /// <summary> Initializes a new instance of DataFlowReference. </summary>
@@ -32,7 +33,7 @@ public DataFlowReference(DataFlowReferenceType referenceType, string referenceNa
         /// <param name="datasetParameters"> Reference data flow parameters from dataset. </param>
         /// <param name="parameters"> Data flow parameters. </param>
         /// <param name="additionalProperties"> Additional Properties. </param>
-        internal DataFlowReference(DataFlowReferenceType referenceType, string referenceName, BinaryData datasetParameters, IDictionary<string, BinaryData> parameters, IDictionary<string, BinaryData> additionalProperties)
+        internal DataFlowReference(DataFlowReferenceType referenceType, string referenceName, BinaryData datasetParameters, IDictionary<string, DataFactoryElement<string>> parameters, IDictionary<string, DataFactoryElement<string>> additionalProperties)
         {
             ReferenceType = referenceType;
             ReferenceName = referenceName;
@@ -106,7 +107,7 @@ internal DataFlowReference(DataFlowReferenceType referenceType, string reference
         /// </list>
         /// </para>
         /// </summary>
-        public IDictionary<string, BinaryData> Parameters { get; }
+        public IDictionary<string, DataFactoryElement<string>> Parameters { get; }
         /// <summary>
         /// Additional Properties
         /// <para>
@@ -137,6 +138,6 @@ internal DataFlowReference(DataFlowReferenceType referenceType, string reference
         /// </list>
         /// </para>
         /// </summary>
-        public IDictionary<string, BinaryData> AdditionalProperties { get; }
+        public IDictionary<string, DataFactoryElement<string>> AdditionalProperties { get; }
     }
 }
diff --git a/src/AzureDataFactory.TestingFramework/Generated/Models/DataFlowSourceSetting.cs b/src/AzureDataFactory.TestingFramework/Generated/Models/DataFlowSourceSetting.cs
index 5d53d40b..3f194de0 100644
--- a/src/AzureDataFactory.TestingFramework/Generated/Models/DataFlowSourceSetting.cs
+++ b/src/AzureDataFactory.TestingFramework/Generated/Models/DataFlowSourceSetting.cs
@@ -6,6 +6,7 @@
 #nullable disable
 
 using Azure.Core;
+using Azure.Core.Expressions.DataFactory;
 
 namespace AzureDataFactory.TestingFramework.Models
 {
@@ -15,7 +16,7 @@ public partial class DataFlowSourceSetting
         /// <summary> Initializes a new instance of DataFlowSourceSetting. </summary>
         public DataFlowSourceSetting()
         {
-            AdditionalProperties = new ChangeTrackingDictionary<string, BinaryData>();
+            AdditionalProperties = new ChangeTrackingDictionary<string, DataFactoryElement<string>>();
         }
 
         /// <summary> The data flow source name. </summary>
@@ -52,6 +53,6 @@ public DataFlowSourceSetting()
         /// </list>
         /// </para>
         /// </summary>
-        public IDictionary<string, BinaryData> AdditionalProperties { get; }
+        public IDictionary<string, DataFactoryElement<string>> AdditionalProperties { get; }
     }
 }
diff --git a/src/AzureDataFactory.TestingFramework/Generated/Models/DataLakeAnalyticsUsqlActivity.Serialization.cs b/src/AzureDataFactory.TestingFramework/Generated/Models/DataLakeAnalyticsUsqlActivity.Serialization.cs
index 73d5a380..95b89933 100644
--- a/src/AzureDataFactory.TestingFramework/Generated/Models/DataLakeAnalyticsUsqlActivity.Serialization.cs
+++ b/src/AzureDataFactory.TestingFramework/Generated/Models/DataLakeAnalyticsUsqlActivity.Serialization.cs
@@ -142,11 +142,11 @@ internal static DataLakeAnalyticsUsqlActivity DeserializeDataLakeAnalyticsUsqlAc
             DataFactoryLinkedServiceReference scriptLinkedService = default;
             Optional<DataFactoryElement<int>> degreeOfParallelism = default;
             Optional<DataFactoryElement<int>> priority = default;
-            Optional<IDictionary<string, BinaryData>> parameters = default;
+            Optional<IDictionary<string, DataFactoryElement<string>>> parameters = default;
             Optional<DataFactoryElement<string>> runtimeVersion = default;
             Optional<DataFactoryElement<string>> compilationMode = default;
-            IDictionary<string, BinaryData> additionalProperties = default;
-            Dictionary<string, BinaryData> additionalPropertiesDictionary = new Dictionary<string, BinaryData>();
+            IDictionary<string, DataFactoryElement<string>> additionalProperties = default;
+            Dictionary<string, DataFactoryElement<string>> additionalPropertiesDictionary = new Dictionary<string, DataFactoryElement<string>>();
             foreach (var property in element.EnumerateObject())
             {
                 if (property.NameEquals("linkedServiceName"u8))
@@ -271,7 +271,7 @@ internal static DataLakeAnalyticsUsqlActivity DeserializeDataLakeAnalyticsUsqlAc
                             {
                                 continue;
                             }
-                            Dictionary<string, BinaryData> dictionary = new Dictionary<string, BinaryData>();
+                            Dictionary<string, DataFactoryElement<string>> dictionary = new Dictionary<string, DataFactoryElement<string>>();
                             foreach (var property1 in property0.Value.EnumerateObject())
                             {
                                 if (property1.Value.ValueKind == JsonValueKind.Null)
@@ -280,7 +280,7 @@ internal static DataLakeAnalyticsUsqlActivity DeserializeDataLakeAnalyticsUsqlAc
                                 }
                                 else
                                 {
-                                    dictionary.Add(property1.Name, BinaryData.FromString(property1.Value.GetRawText()));
+                                    dictionary.Add(property1.Name, JsonSerializer.Deserialize<DataFactoryElement<string>>(property1.Value.GetRawText()));
                                 }
                             }
                             parameters = dictionary;
@@ -307,7 +307,7 @@ internal static DataLakeAnalyticsUsqlActivity DeserializeDataLakeAnalyticsUsqlAc
                     }
                     continue;
                 }
-                additionalPropertiesDictionary.Add(property.Name, BinaryData.FromString(property.Value.GetRawText()));
+                additionalPropertiesDictionary.Add(property.Name, JsonSerializer.Deserialize<DataFactoryElement<string>>(property.Value.GetRawText()));
             }
             additionalProperties = additionalPropertiesDictionary;
             return new DataLakeAnalyticsUsqlActivity(name, type, description.Value, Optional.ToNullable(state), Optional.ToNullable(onInactiveMarkAs), Optional.ToList(dependsOn), Optional.ToList(userProperties), additionalProperties, linkedServiceName, policy.Value, scriptPath, scriptLinkedService, degreeOfParallelism.Value, priority.Value, Optional.ToDictionary(parameters), runtimeVersion.Value, compilationMode.Value);
diff --git a/src/AzureDataFactory.TestingFramework/Generated/Models/DataLakeAnalyticsUsqlActivity.cs b/src/AzureDataFactory.TestingFramework/Generated/Models/DataLakeAnalyticsUsqlActivity.cs
index 99f51512..e3f27c31 100644
--- a/src/AzureDataFactory.TestingFramework/Generated/Models/DataLakeAnalyticsUsqlActivity.cs
+++ b/src/AzureDataFactory.TestingFramework/Generated/Models/DataLakeAnalyticsUsqlActivity.cs
@@ -26,7 +26,7 @@ public DataLakeAnalyticsUsqlActivity(string name, DataFactoryElement<string> scr
 
             ScriptPath = scriptPath;
             ScriptLinkedService = scriptLinkedService;
-            Parameters = new ChangeTrackingDictionary<string, BinaryData>();
+            Parameters = new ChangeTrackingDictionary<string, DataFactoryElement<string>>();
             ActivityType = "DataLakeAnalyticsU-SQL";
         }
 
@@ -48,7 +48,7 @@ public DataLakeAnalyticsUsqlActivity(string name, DataFactoryElement<string> scr
         /// <param name="parameters"> Parameters for U-SQL job request. </param>
         /// <param name="runtimeVersion"> Runtime version of the U-SQL engine to use. Type: string (or Expression with resultType string). </param>
         /// <param name="compilationMode"> Compilation mode of U-SQL. Must be one of these values : Semantic, Full and SingleBox. Type: string (or Expression with resultType string). </param>
-        internal DataLakeAnalyticsUsqlActivity(string name, string activityType, string description, PipelineActivityState? state, ActivityOnInactiveMarkAs? onInactiveMarkAs, IList<PipelineActivityDependency> dependsOn, IList<PipelineActivityUserProperty> userProperties, IDictionary<string, BinaryData> additionalProperties, DataFactoryLinkedServiceReference linkedServiceName, PipelineActivityPolicy policy, DataFactoryElement<string> scriptPath, DataFactoryLinkedServiceReference scriptLinkedService, DataFactoryElement<int> degreeOfParallelism, DataFactoryElement<int> priority, IDictionary<string, BinaryData> parameters, DataFactoryElement<string> runtimeVersion, DataFactoryElement<string> compilationMode) : base(name, activityType, description, state, onInactiveMarkAs, dependsOn, userProperties, additionalProperties, linkedServiceName, policy)
+        internal DataLakeAnalyticsUsqlActivity(string name, string activityType, string description, PipelineActivityState? state, ActivityOnInactiveMarkAs? onInactiveMarkAs, IList<PipelineActivityDependency> dependsOn, IList<PipelineActivityUserProperty> userProperties, IDictionary<string, DataFactoryElement<string>> additionalProperties, DataFactoryLinkedServiceReference linkedServiceName, PipelineActivityPolicy policy, DataFactoryElement<string> scriptPath, DataFactoryLinkedServiceReference scriptLinkedService, DataFactoryElement<int> degreeOfParallelism, DataFactoryElement<int> priority, IDictionary<string, DataFactoryElement<string>> parameters, DataFactoryElement<string> runtimeVersion, DataFactoryElement<string> compilationMode) : base(name, activityType, description, state, onInactiveMarkAs, dependsOn, userProperties, additionalProperties, linkedServiceName, policy)
         {
             ScriptPath = scriptPath;
             ScriptLinkedService = scriptLinkedService;
@@ -98,7 +98,7 @@ internal DataLakeAnalyticsUsqlActivity(string name, string activityType, string
         /// </list>
         /// </para>
         /// </summary>
-        public IDictionary<string, BinaryData> Parameters { get; }
+        public IDictionary<string, DataFactoryElement<string>> Parameters { get; }
         /// <summary> Runtime version of the U-SQL engine to use. Type: string (or Expression with resultType string). </summary>
         public DataFactoryElement<string> RuntimeVersion { get; set; }
         /// <summary> Compilation mode of U-SQL. Must be one of these values : Semantic, Full and SingleBox. Type: string (or Expression with resultType string). </summary>
diff --git a/src/AzureDataFactory.TestingFramework/Generated/Models/DatabricksNotebookActivity.Serialization.cs b/src/AzureDataFactory.TestingFramework/Generated/Models/DatabricksNotebookActivity.Serialization.cs
index 5935e244..5f557a54 100644
--- a/src/AzureDataFactory.TestingFramework/Generated/Models/DatabricksNotebookActivity.Serialization.cs
+++ b/src/AzureDataFactory.TestingFramework/Generated/Models/DatabricksNotebookActivity.Serialization.cs
@@ -148,10 +148,10 @@ internal static DatabricksNotebookActivity DeserializeDatabricksNotebookActivity
             Optional<IList<PipelineActivityDependency>> dependsOn = default;
             Optional<IList<PipelineActivityUserProperty>> userProperties = default;
             DataFactoryElement<string> notebookPath = default;
-            Optional<IDictionary<string, BinaryData>> baseParameters = default;
-            Optional<IList<IDictionary<string, BinaryData>>> libraries = default;
-            IDictionary<string, BinaryData> additionalProperties = default;
-            Dictionary<string, BinaryData> additionalPropertiesDictionary = new Dictionary<string, BinaryData>();
+            Optional<IDictionary<string, DataFactoryElement<string>>> baseParameters = default;
+            Optional<IList<IDictionary<string, DataFactoryElement<string>>>> libraries = default;
+            IDictionary<string, DataFactoryElement<string>> additionalProperties = default;
+            Dictionary<string, DataFactoryElement<string>> additionalPropertiesDictionary = new Dictionary<string, DataFactoryElement<string>>();
             foreach (var property in element.EnumerateObject())
             {
                 if (property.NameEquals("linkedServiceName"u8))
@@ -253,7 +253,7 @@ internal static DatabricksNotebookActivity DeserializeDatabricksNotebookActivity
                             {
                                 continue;
                             }
-                            Dictionary<string, BinaryData> dictionary = new Dictionary<string, BinaryData>();
+                            Dictionary<string, DataFactoryElement<string>> dictionary = new Dictionary<string, DataFactoryElement<string>>();
                             foreach (var property1 in property0.Value.EnumerateObject())
                             {
                                 if (property1.Value.ValueKind == JsonValueKind.Null)
@@ -262,7 +262,7 @@ internal static DatabricksNotebookActivity DeserializeDatabricksNotebookActivity
                                 }
                                 else
                                 {
-                                    dictionary.Add(property1.Name, BinaryData.FromString(property1.Value.GetRawText()));
+                                    dictionary.Add(property1.Name, JsonSerializer.Deserialize<DataFactoryElement<string>>(property1.Value.GetRawText()));
                                 }
                             }
                             baseParameters = dictionary;
@@ -274,7 +274,7 @@ internal static DatabricksNotebookActivity DeserializeDatabricksNotebookActivity
                             {
                                 continue;
                             }
-                            List<IDictionary<string, BinaryData>> array = new List<IDictionary<string, BinaryData>>();
+                            List<IDictionary<string, DataFactoryElement<string>>> array = new List<IDictionary<string, DataFactoryElement<string>>>();
                             foreach (var item in property0.Value.EnumerateArray())
                             {
                                 if (item.ValueKind == JsonValueKind.Null)
@@ -283,7 +283,7 @@ internal static DatabricksNotebookActivity DeserializeDatabricksNotebookActivity
                                 }
                                 else
                                 {
-                                    Dictionary<string, BinaryData> dictionary = new Dictionary<string, BinaryData>();
+                                    Dictionary<string, DataFactoryElement<string>> dictionary = new Dictionary<string, DataFactoryElement<string>>();
                                     foreach (var property1 in item.EnumerateObject())
                                     {
                                         if (property1.Value.ValueKind == JsonValueKind.Null)
@@ -292,7 +292,7 @@ internal static DatabricksNotebookActivity DeserializeDatabricksNotebookActivity
                                         }
                                         else
                                         {
-                                            dictionary.Add(property1.Name, BinaryData.FromString(property1.Value.GetRawText()));
+                                            dictionary.Add(property1.Name, JsonSerializer.Deserialize<DataFactoryElement<string>>(property1.Value.GetRawText()));
                                         }
                                     }
                                     array.Add(dictionary);
@@ -304,7 +304,7 @@ internal static DatabricksNotebookActivity DeserializeDatabricksNotebookActivity
                     }
                     continue;
                 }
-                additionalPropertiesDictionary.Add(property.Name, BinaryData.FromString(property.Value.GetRawText()));
+                additionalPropertiesDictionary.Add(property.Name, JsonSerializer.Deserialize<DataFactoryElement<string>>(property.Value.GetRawText()));
             }
             additionalProperties = additionalPropertiesDictionary;
             return new DatabricksNotebookActivity(name, type, description.Value, Optional.ToNullable(state), Optional.ToNullable(onInactiveMarkAs), Optional.ToList(dependsOn), Optional.ToList(userProperties), additionalProperties, linkedServiceName, policy.Value, notebookPath, Optional.ToDictionary(baseParameters), Optional.ToList(libraries));
diff --git a/src/AzureDataFactory.TestingFramework/Generated/Models/DatabricksNotebookActivity.cs b/src/AzureDataFactory.TestingFramework/Generated/Models/DatabricksNotebookActivity.cs
index e73209a4..7ea957ba 100644
--- a/src/AzureDataFactory.TestingFramework/Generated/Models/DatabricksNotebookActivity.cs
+++ b/src/AzureDataFactory.TestingFramework/Generated/Models/DatabricksNotebookActivity.cs
@@ -23,8 +23,8 @@ public DatabricksNotebookActivity(string name, DataFactoryElement<string> notebo
             Argument.AssertNotNull(notebookPath, nameof(notebookPath));
 
             NotebookPath = notebookPath;
-            BaseParameters = new ChangeTrackingDictionary<string, BinaryData>();
-            Libraries = new ChangeTrackingList<IDictionary<string, BinaryData>>();
+            BaseParameters = new ChangeTrackingDictionary<string, DataFactoryElement<string>>();
+            Libraries = new ChangeTrackingList<IDictionary<string, DataFactoryElement<string>>>();
             ActivityType = "DatabricksNotebook";
         }
 
@@ -42,7 +42,7 @@ public DatabricksNotebookActivity(string name, DataFactoryElement<string> notebo
         /// <param name="notebookPath"> The absolute path of the notebook to be run in the Databricks Workspace. This path must begin with a slash. Type: string (or Expression with resultType string). </param>
         /// <param name="baseParameters"> Base parameters to be used for each run of this job.If the notebook takes a parameter that is not specified, the default value from the notebook will be used. </param>
         /// <param name="libraries"> A list of libraries to be installed on the cluster that will execute the job. </param>
-        internal DatabricksNotebookActivity(string name, string activityType, string description, PipelineActivityState? state, ActivityOnInactiveMarkAs? onInactiveMarkAs, IList<PipelineActivityDependency> dependsOn, IList<PipelineActivityUserProperty> userProperties, IDictionary<string, BinaryData> additionalProperties, DataFactoryLinkedServiceReference linkedServiceName, PipelineActivityPolicy policy, DataFactoryElement<string> notebookPath, IDictionary<string, BinaryData> baseParameters, IList<IDictionary<string, BinaryData>> libraries) : base(name, activityType, description, state, onInactiveMarkAs, dependsOn, userProperties, additionalProperties, linkedServiceName, policy)
+        internal DatabricksNotebookActivity(string name, string activityType, string description, PipelineActivityState? state, ActivityOnInactiveMarkAs? onInactiveMarkAs, IList<PipelineActivityDependency> dependsOn, IList<PipelineActivityUserProperty> userProperties, IDictionary<string, DataFactoryElement<string>> additionalProperties, DataFactoryLinkedServiceReference linkedServiceName, PipelineActivityPolicy policy, DataFactoryElement<string> notebookPath, IDictionary<string, DataFactoryElement<string>> baseParameters, IList<IDictionary<string, DataFactoryElement<string>>> libraries) : base(name, activityType, description, state, onInactiveMarkAs, dependsOn, userProperties, additionalProperties, linkedServiceName, policy)
         {
             NotebookPath = notebookPath;
             BaseParameters = baseParameters;
@@ -82,8 +82,8 @@ internal DatabricksNotebookActivity(string name, string activityType, string des
         /// </list>
         /// </para>
         /// </summary>
-        public IDictionary<string, BinaryData> BaseParameters { get; }
+        public IDictionary<string, DataFactoryElement<string>> BaseParameters { get; }
         /// <summary> A list of libraries to be installed on the cluster that will execute the job. </summary>
-        public IList<IDictionary<string, BinaryData>> Libraries { get; }
+        public IList<IDictionary<string, DataFactoryElement<string>>> Libraries { get; }
     }
 }
diff --git a/src/AzureDataFactory.TestingFramework/Generated/Models/DatabricksSparkJarActivity.Serialization.cs b/src/AzureDataFactory.TestingFramework/Generated/Models/DatabricksSparkJarActivity.Serialization.cs
index b8bac663..00b1c689 100644
--- a/src/AzureDataFactory.TestingFramework/Generated/Models/DatabricksSparkJarActivity.Serialization.cs
+++ b/src/AzureDataFactory.TestingFramework/Generated/Models/DatabricksSparkJarActivity.Serialization.cs
@@ -148,9 +148,9 @@ internal static DatabricksSparkJarActivity DeserializeDatabricksSparkJarActivity
             Optional<IList<PipelineActivityUserProperty>> userProperties = default;
             DataFactoryElement<string> mainClassName = default;
             Optional<IList<BinaryData>> parameters = default;
-            Optional<IList<IDictionary<string, BinaryData>>> libraries = default;
-            IDictionary<string, BinaryData> additionalProperties = default;
-            Dictionary<string, BinaryData> additionalPropertiesDictionary = new Dictionary<string, BinaryData>();
+            Optional<IList<IDictionary<string, DataFactoryElement<string>>>> libraries = default;
+            IDictionary<string, DataFactoryElement<string>> additionalProperties = default;
+            Dictionary<string, DataFactoryElement<string>> additionalPropertiesDictionary = new Dictionary<string, DataFactoryElement<string>>();
             foreach (var property in element.EnumerateObject())
             {
                 if (property.NameEquals("linkedServiceName"u8))
@@ -273,7 +273,7 @@ internal static DatabricksSparkJarActivity DeserializeDatabricksSparkJarActivity
                             {
                                 continue;
                             }
-                            List<IDictionary<string, BinaryData>> array = new List<IDictionary<string, BinaryData>>();
+                            List<IDictionary<string, DataFactoryElement<string>>> array = new List<IDictionary<string, DataFactoryElement<string>>>();
                             foreach (var item in property0.Value.EnumerateArray())
                             {
                                 if (item.ValueKind == JsonValueKind.Null)
@@ -282,7 +282,7 @@ internal static DatabricksSparkJarActivity DeserializeDatabricksSparkJarActivity
                                 }
                                 else
                                 {
-                                    Dictionary<string, BinaryData> dictionary = new Dictionary<string, BinaryData>();
+                                    Dictionary<string, DataFactoryElement<string>> dictionary = new Dictionary<string, DataFactoryElement<string>>();
                                     foreach (var property1 in item.EnumerateObject())
                                     {
                                         if (property1.Value.ValueKind == JsonValueKind.Null)
@@ -291,7 +291,7 @@ internal static DatabricksSparkJarActivity DeserializeDatabricksSparkJarActivity
                                         }
                                         else
                                         {
-                                            dictionary.Add(property1.Name, BinaryData.FromString(property1.Value.GetRawText()));
+                                            dictionary.Add(property1.Name, JsonSerializer.Deserialize<DataFactoryElement<string>>(property1.Value.GetRawText()));
                                         }
                                     }
                                     array.Add(dictionary);
@@ -303,7 +303,7 @@ internal static DatabricksSparkJarActivity DeserializeDatabricksSparkJarActivity
                     }
                     continue;
                 }
-                additionalPropertiesDictionary.Add(property.Name, BinaryData.FromString(property.Value.GetRawText()));
+                additionalPropertiesDictionary.Add(property.Name, JsonSerializer.Deserialize<DataFactoryElement<string>>(property.Value.GetRawText()));
             }
             additionalProperties = additionalPropertiesDictionary;
             return new DatabricksSparkJarActivity(name, type, description.Value, Optional.ToNullable(state), Optional.ToNullable(onInactiveMarkAs), Optional.ToList(dependsOn), Optional.ToList(userProperties), additionalProperties, linkedServiceName, policy.Value, mainClassName, Optional.ToList(parameters), Optional.ToList(libraries));
diff --git a/src/AzureDataFactory.TestingFramework/Generated/Models/DatabricksSparkJarActivity.cs b/src/AzureDataFactory.TestingFramework/Generated/Models/DatabricksSparkJarActivity.cs
index 547ebe6e..b831f48e 100644
--- a/src/AzureDataFactory.TestingFramework/Generated/Models/DatabricksSparkJarActivity.cs
+++ b/src/AzureDataFactory.TestingFramework/Generated/Models/DatabricksSparkJarActivity.cs
@@ -24,7 +24,7 @@ public DatabricksSparkJarActivity(string name, DataFactoryElement<string> mainCl
 
             MainClassName = mainClassName;
             Parameters = new ChangeTrackingList<BinaryData>();
-            Libraries = new ChangeTrackingList<IDictionary<string, BinaryData>>();
+            Libraries = new ChangeTrackingList<IDictionary<string, DataFactoryElement<string>>>();
             ActivityType = "DatabricksSparkJar";
         }
 
@@ -42,7 +42,7 @@ public DatabricksSparkJarActivity(string name, DataFactoryElement<string> mainCl
         /// <param name="mainClassName"> The full name of the class containing the main method to be executed. This class must be contained in a JAR provided as a library. Type: string (or Expression with resultType string). </param>
         /// <param name="parameters"> Parameters that will be passed to the main method. </param>
         /// <param name="libraries"> A list of libraries to be installed on the cluster that will execute the job. </param>
-        internal DatabricksSparkJarActivity(string name, string activityType, string description, PipelineActivityState? state, ActivityOnInactiveMarkAs? onInactiveMarkAs, IList<PipelineActivityDependency> dependsOn, IList<PipelineActivityUserProperty> userProperties, IDictionary<string, BinaryData> additionalProperties, DataFactoryLinkedServiceReference linkedServiceName, PipelineActivityPolicy policy, DataFactoryElement<string> mainClassName, IList<BinaryData> parameters, IList<IDictionary<string, BinaryData>> libraries) : base(name, activityType, description, state, onInactiveMarkAs, dependsOn, userProperties, additionalProperties, linkedServiceName, policy)
+        internal DatabricksSparkJarActivity(string name, string activityType, string description, PipelineActivityState? state, ActivityOnInactiveMarkAs? onInactiveMarkAs, IList<PipelineActivityDependency> dependsOn, IList<PipelineActivityUserProperty> userProperties, IDictionary<string, DataFactoryElement<string>> additionalProperties, DataFactoryLinkedServiceReference linkedServiceName, PipelineActivityPolicy policy, DataFactoryElement<string> mainClassName, IList<BinaryData> parameters, IList<IDictionary<string, DataFactoryElement<string>>> libraries) : base(name, activityType, description, state, onInactiveMarkAs, dependsOn, userProperties, additionalProperties, linkedServiceName, policy)
         {
             MainClassName = mainClassName;
             Parameters = parameters;
@@ -84,6 +84,6 @@ internal DatabricksSparkJarActivity(string name, string activityType, string des
         /// </summary>
         public IList<BinaryData> Parameters { get; }
         /// <summary> A list of libraries to be installed on the cluster that will execute the job. </summary>
-        public IList<IDictionary<string, BinaryData>> Libraries { get; }
+        public IList<IDictionary<string, DataFactoryElement<string>>> Libraries { get; }
     }
 }
diff --git a/src/AzureDataFactory.TestingFramework/Generated/Models/DatabricksSparkPythonActivity.Serialization.cs b/src/AzureDataFactory.TestingFramework/Generated/Models/DatabricksSparkPythonActivity.Serialization.cs
index 6ae09a78..f1c34c0f 100644
--- a/src/AzureDataFactory.TestingFramework/Generated/Models/DatabricksSparkPythonActivity.Serialization.cs
+++ b/src/AzureDataFactory.TestingFramework/Generated/Models/DatabricksSparkPythonActivity.Serialization.cs
@@ -148,9 +148,9 @@ internal static DatabricksSparkPythonActivity DeserializeDatabricksSparkPythonAc
             Optional<IList<PipelineActivityUserProperty>> userProperties = default;
             DataFactoryElement<string> pythonFile = default;
             Optional<IList<BinaryData>> parameters = default;
-            Optional<IList<IDictionary<string, BinaryData>>> libraries = default;
-            IDictionary<string, BinaryData> additionalProperties = default;
-            Dictionary<string, BinaryData> additionalPropertiesDictionary = new Dictionary<string, BinaryData>();
+            Optional<IList<IDictionary<string, DataFactoryElement<string>>>> libraries = default;
+            IDictionary<string, DataFactoryElement<string>> additionalProperties = default;
+            Dictionary<string, DataFactoryElement<string>> additionalPropertiesDictionary = new Dictionary<string, DataFactoryElement<string>>();
             foreach (var property in element.EnumerateObject())
             {
                 if (property.NameEquals("linkedServiceName"u8))
@@ -273,7 +273,7 @@ internal static DatabricksSparkPythonActivity DeserializeDatabricksSparkPythonAc
                             {
                                 continue;
                             }
-                            List<IDictionary<string, BinaryData>> array = new List<IDictionary<string, BinaryData>>();
+                            List<IDictionary<string, DataFactoryElement<string>>> array = new List<IDictionary<string, DataFactoryElement<string>>>();
                             foreach (var item in property0.Value.EnumerateArray())
                             {
                                 if (item.ValueKind == JsonValueKind.Null)
@@ -282,7 +282,7 @@ internal static DatabricksSparkPythonActivity DeserializeDatabricksSparkPythonAc
                                 }
                                 else
                                 {
-                                    Dictionary<string, BinaryData> dictionary = new Dictionary<string, BinaryData>();
+                                    Dictionary<string, DataFactoryElement<string>> dictionary = new Dictionary<string, DataFactoryElement<string>>();
                                     foreach (var property1 in item.EnumerateObject())
                                     {
                                         if (property1.Value.ValueKind == JsonValueKind.Null)
@@ -291,7 +291,7 @@ internal static DatabricksSparkPythonActivity DeserializeDatabricksSparkPythonAc
                                         }
                                         else
                                         {
-                                            dictionary.Add(property1.Name, BinaryData.FromString(property1.Value.GetRawText()));
+                                            dictionary.Add(property1.Name, JsonSerializer.Deserialize<DataFactoryElement<string>>(property1.Value.GetRawText()));
                                         }
                                     }
                                     array.Add(dictionary);
@@ -303,7 +303,7 @@ internal static DatabricksSparkPythonActivity DeserializeDatabricksSparkPythonAc
                     }
                     continue;
                 }
-                additionalPropertiesDictionary.Add(property.Name, BinaryData.FromString(property.Value.GetRawText()));
+                additionalPropertiesDictionary.Add(property.Name, JsonSerializer.Deserialize<DataFactoryElement<string>>(property.Value.GetRawText()));
             }
             additionalProperties = additionalPropertiesDictionary;
             return new DatabricksSparkPythonActivity(name, type, description.Value, Optional.ToNullable(state), Optional.ToNullable(onInactiveMarkAs), Optional.ToList(dependsOn), Optional.ToList(userProperties), additionalProperties, linkedServiceName, policy.Value, pythonFile, Optional.ToList(parameters), Optional.ToList(libraries));
diff --git a/src/AzureDataFactory.TestingFramework/Generated/Models/DatabricksSparkPythonActivity.cs b/src/AzureDataFactory.TestingFramework/Generated/Models/DatabricksSparkPythonActivity.cs
index d1c041c6..8e164772 100644
--- a/src/AzureDataFactory.TestingFramework/Generated/Models/DatabricksSparkPythonActivity.cs
+++ b/src/AzureDataFactory.TestingFramework/Generated/Models/DatabricksSparkPythonActivity.cs
@@ -24,7 +24,7 @@ public DatabricksSparkPythonActivity(string name, DataFactoryElement<string> pyt
 
             PythonFile = pythonFile;
             Parameters = new ChangeTrackingList<BinaryData>();
-            Libraries = new ChangeTrackingList<IDictionary<string, BinaryData>>();
+            Libraries = new ChangeTrackingList<IDictionary<string, DataFactoryElement<string>>>();
             ActivityType = "DatabricksSparkPython";
         }
 
@@ -42,7 +42,7 @@ public DatabricksSparkPythonActivity(string name, DataFactoryElement<string> pyt
         /// <param name="pythonFile"> The URI of the Python file to be executed. DBFS paths are supported. Type: string (or Expression with resultType string). </param>
         /// <param name="parameters"> Command line parameters that will be passed to the Python file. </param>
         /// <param name="libraries"> A list of libraries to be installed on the cluster that will execute the job. </param>
-        internal DatabricksSparkPythonActivity(string name, string activityType, string description, PipelineActivityState? state, ActivityOnInactiveMarkAs? onInactiveMarkAs, IList<PipelineActivityDependency> dependsOn, IList<PipelineActivityUserProperty> userProperties, IDictionary<string, BinaryData> additionalProperties, DataFactoryLinkedServiceReference linkedServiceName, PipelineActivityPolicy policy, DataFactoryElement<string> pythonFile, IList<BinaryData> parameters, IList<IDictionary<string, BinaryData>> libraries) : base(name, activityType, description, state, onInactiveMarkAs, dependsOn, userProperties, additionalProperties, linkedServiceName, policy)
+        internal DatabricksSparkPythonActivity(string name, string activityType, string description, PipelineActivityState? state, ActivityOnInactiveMarkAs? onInactiveMarkAs, IList<PipelineActivityDependency> dependsOn, IList<PipelineActivityUserProperty> userProperties, IDictionary<string, DataFactoryElement<string>> additionalProperties, DataFactoryLinkedServiceReference linkedServiceName, PipelineActivityPolicy policy, DataFactoryElement<string> pythonFile, IList<BinaryData> parameters, IList<IDictionary<string, DataFactoryElement<string>>> libraries) : base(name, activityType, description, state, onInactiveMarkAs, dependsOn, userProperties, additionalProperties, linkedServiceName, policy)
         {
             PythonFile = pythonFile;
             Parameters = parameters;
@@ -84,6 +84,6 @@ internal DatabricksSparkPythonActivity(string name, string activityType, string
         /// </summary>
         public IList<BinaryData> Parameters { get; }
         /// <summary> A list of libraries to be installed on the cluster that will execute the job. </summary>
-        public IList<IDictionary<string, BinaryData>> Libraries { get; }
+        public IList<IDictionary<string, DataFactoryElement<string>>> Libraries { get; }
     }
 }
diff --git a/src/AzureDataFactory.TestingFramework/Generated/Models/DatasetAvroFormat.Serialization.cs b/src/AzureDataFactory.TestingFramework/Generated/Models/DatasetAvroFormat.Serialization.cs
index f9393ad8..a8ba19a7 100644
--- a/src/AzureDataFactory.TestingFramework/Generated/Models/DatasetAvroFormat.Serialization.cs
+++ b/src/AzureDataFactory.TestingFramework/Generated/Models/DatasetAvroFormat.Serialization.cs
@@ -49,8 +49,8 @@ internal static DatasetAvroFormat DeserializeDatasetAvroFormat(JsonElement eleme
             string type = default;
             Optional<DataFactoryElement<string>> serializer = default;
             Optional<DataFactoryElement<string>> deserializer = default;
-            IDictionary<string, BinaryData> additionalProperties = default;
-            Dictionary<string, BinaryData> additionalPropertiesDictionary = new Dictionary<string, BinaryData>();
+            IDictionary<string, DataFactoryElement<string>> additionalProperties = default;
+            Dictionary<string, DataFactoryElement<string>> additionalPropertiesDictionary = new Dictionary<string, DataFactoryElement<string>>();
             foreach (var property in element.EnumerateObject())
             {
                 if (property.NameEquals("type"u8))
@@ -76,7 +76,7 @@ internal static DatasetAvroFormat DeserializeDatasetAvroFormat(JsonElement eleme
                     deserializer = JsonSerializer.Deserialize<DataFactoryElement<string>>(property.Value.GetRawText());
                     continue;
                 }
-                additionalPropertiesDictionary.Add(property.Name, BinaryData.FromString(property.Value.GetRawText()));
+                additionalPropertiesDictionary.Add(property.Name, JsonSerializer.Deserialize<DataFactoryElement<string>>(property.Value.GetRawText()));
             }
             additionalProperties = additionalPropertiesDictionary;
             return new DatasetAvroFormat(type, serializer.Value, deserializer.Value, additionalProperties);
diff --git a/src/AzureDataFactory.TestingFramework/Generated/Models/DatasetAvroFormat.cs b/src/AzureDataFactory.TestingFramework/Generated/Models/DatasetAvroFormat.cs
index a9739298..9ac604b0 100644
--- a/src/AzureDataFactory.TestingFramework/Generated/Models/DatasetAvroFormat.cs
+++ b/src/AzureDataFactory.TestingFramework/Generated/Models/DatasetAvroFormat.cs
@@ -23,7 +23,7 @@ public DatasetAvroFormat()
         /// <param name="serializer"> Serializer. Type: string (or Expression with resultType string). </param>
         /// <param name="deserializer"> Deserializer. Type: string (or Expression with resultType string). </param>
         /// <param name="additionalProperties"> Additional Properties. </param>
-        internal DatasetAvroFormat(string datasetStorageFormatType, DataFactoryElement<string> serializer, DataFactoryElement<string> deserializer, IDictionary<string, BinaryData> additionalProperties) : base(datasetStorageFormatType, serializer, deserializer, additionalProperties)
+        internal DatasetAvroFormat(string datasetStorageFormatType, DataFactoryElement<string> serializer, DataFactoryElement<string> deserializer, IDictionary<string, DataFactoryElement<string>> additionalProperties) : base(datasetStorageFormatType, serializer, deserializer, additionalProperties)
         {
             DatasetStorageFormatType = datasetStorageFormatType ?? "AvroFormat";
         }
diff --git a/src/AzureDataFactory.TestingFramework/Generated/Models/DatasetCompression.Serialization.cs b/src/AzureDataFactory.TestingFramework/Generated/Models/DatasetCompression.Serialization.cs
index 506ab6d6..10426ea8 100644
--- a/src/AzureDataFactory.TestingFramework/Generated/Models/DatasetCompression.Serialization.cs
+++ b/src/AzureDataFactory.TestingFramework/Generated/Models/DatasetCompression.Serialization.cs
@@ -43,8 +43,8 @@ internal static DatasetCompression DeserializeDatasetCompression(JsonElement ele
             }
             DataFactoryElement<string> type = default;
             Optional<DataFactoryElement<string>> level = default;
-            IDictionary<string, BinaryData> additionalProperties = default;
-            Dictionary<string, BinaryData> additionalPropertiesDictionary = new Dictionary<string, BinaryData>();
+            IDictionary<string, DataFactoryElement<string>> additionalProperties = default;
+            Dictionary<string, DataFactoryElement<string>> additionalPropertiesDictionary = new Dictionary<string, DataFactoryElement<string>>();
             foreach (var property in element.EnumerateObject())
             {
                 if (property.NameEquals("type"u8))
@@ -61,7 +61,7 @@ internal static DatasetCompression DeserializeDatasetCompression(JsonElement ele
                     level = JsonSerializer.Deserialize<DataFactoryElement<string>>(property.Value.GetRawText());
                     continue;
                 }
-                additionalPropertiesDictionary.Add(property.Name, BinaryData.FromString(property.Value.GetRawText()));
+                additionalPropertiesDictionary.Add(property.Name, JsonSerializer.Deserialize<DataFactoryElement<string>>(property.Value.GetRawText()));
             }
             additionalProperties = additionalPropertiesDictionary;
             return new DatasetCompression(type, level.Value, additionalProperties);
diff --git a/src/AzureDataFactory.TestingFramework/Generated/Models/DatasetCompression.cs b/src/AzureDataFactory.TestingFramework/Generated/Models/DatasetCompression.cs
index 6d706b72..19d180fd 100644
--- a/src/AzureDataFactory.TestingFramework/Generated/Models/DatasetCompression.cs
+++ b/src/AzureDataFactory.TestingFramework/Generated/Models/DatasetCompression.cs
@@ -21,14 +21,14 @@ public DatasetCompression(DataFactoryElement<string> datasetCompressionType)
             Argument.AssertNotNull(datasetCompressionType, nameof(datasetCompressionType));
 
             DatasetCompressionType = datasetCompressionType;
-            AdditionalProperties = new ChangeTrackingDictionary<string, BinaryData>();
+            AdditionalProperties = new ChangeTrackingDictionary<string, DataFactoryElement<string>>();
         }
 
         /// <summary> Initializes a new instance of DatasetCompression. </summary>
         /// <param name="datasetCompressionType"> Type of dataset compression. Type: string (or Expression with resultType string). </param>
         /// <param name="level"> The dataset compression level. Type: string (or Expression with resultType string). </param>
         /// <param name="additionalProperties"> Additional Properties. </param>
-        internal DatasetCompression(DataFactoryElement<string> datasetCompressionType, DataFactoryElement<string> level, IDictionary<string, BinaryData> additionalProperties)
+        internal DatasetCompression(DataFactoryElement<string> datasetCompressionType, DataFactoryElement<string> level, IDictionary<string, DataFactoryElement<string>> additionalProperties)
         {
             DatasetCompressionType = datasetCompressionType;
             Level = level;
@@ -69,6 +69,6 @@ internal DatasetCompression(DataFactoryElement<string> datasetCompressionType, D
         /// </list>
         /// </para>
         /// </summary>
-        public IDictionary<string, BinaryData> AdditionalProperties { get; }
+        public IDictionary<string, DataFactoryElement<string>> AdditionalProperties { get; }
     }
 }
diff --git a/src/AzureDataFactory.TestingFramework/Generated/Models/DatasetJsonFormat.Serialization.cs b/src/AzureDataFactory.TestingFramework/Generated/Models/DatasetJsonFormat.Serialization.cs
index b48570f3..036ab644 100644
--- a/src/AzureDataFactory.TestingFramework/Generated/Models/DatasetJsonFormat.Serialization.cs
+++ b/src/AzureDataFactory.TestingFramework/Generated/Models/DatasetJsonFormat.Serialization.cs
@@ -87,8 +87,8 @@ internal static DatasetJsonFormat DeserializeDatasetJsonFormat(JsonElement eleme
             string type = default;
             Optional<DataFactoryElement<string>> serializer = default;
             Optional<DataFactoryElement<string>> deserializer = default;
-            IDictionary<string, BinaryData> additionalProperties = default;
-            Dictionary<string, BinaryData> additionalPropertiesDictionary = new Dictionary<string, BinaryData>();
+            IDictionary<string, DataFactoryElement<string>> additionalProperties = default;
+            Dictionary<string, DataFactoryElement<string>> additionalPropertiesDictionary = new Dictionary<string, DataFactoryElement<string>>();
             foreach (var property in element.EnumerateObject())
             {
                 if (property.NameEquals("filePattern"u8))
@@ -159,7 +159,7 @@ internal static DatasetJsonFormat DeserializeDatasetJsonFormat(JsonElement eleme
                     deserializer = JsonSerializer.Deserialize<DataFactoryElement<string>>(property.Value.GetRawText());
                     continue;
                 }
-                additionalPropertiesDictionary.Add(property.Name, BinaryData.FromString(property.Value.GetRawText()));
+                additionalPropertiesDictionary.Add(property.Name, JsonSerializer.Deserialize<DataFactoryElement<string>>(property.Value.GetRawText()));
             }
             additionalProperties = additionalPropertiesDictionary;
             return new DatasetJsonFormat(type, serializer.Value, deserializer.Value, additionalProperties, filePattern.Value, nestingSeparator.Value, encodingName.Value, jsonNodeReference.Value, jsonPathDefinition.Value);
diff --git a/src/AzureDataFactory.TestingFramework/Generated/Models/DatasetJsonFormat.cs b/src/AzureDataFactory.TestingFramework/Generated/Models/DatasetJsonFormat.cs
index c29daadf..d5cf2cb3 100644
--- a/src/AzureDataFactory.TestingFramework/Generated/Models/DatasetJsonFormat.cs
+++ b/src/AzureDataFactory.TestingFramework/Generated/Models/DatasetJsonFormat.cs
@@ -28,7 +28,7 @@ public DatasetJsonFormat()
         /// <param name="encodingName"> The code page name of the preferred encoding. If not provided, the default value is 'utf-8', unless the byte order mark (BOM) denotes another Unicode encoding. The full list of supported values can be found in the 'Name' column of the table of encodings in the following reference: https://go.microsoft.com/fwlink/?linkid=861078. Type: string (or Expression with resultType string). </param>
         /// <param name="jsonNodeReference"> The JSONPath of the JSON array element to be flattened. Example: "$.ArrayPath". Type: string (or Expression with resultType string). </param>
         /// <param name="jsonPathDefinition"> The JSONPath definition for each column mapping with a customized column name to extract data from JSON file. For fields under root object, start with "$"; for fields inside the array chosen by jsonNodeReference property, start from the array element. Example: {"Column1": "$.Column1Path", "Column2": "Column2PathInArray"}. Type: object (or Expression with resultType object). </param>
-        internal DatasetJsonFormat(string datasetStorageFormatType, DataFactoryElement<string> serializer, DataFactoryElement<string> deserializer, IDictionary<string, BinaryData> additionalProperties, BinaryData filePattern, DataFactoryElement<string> nestingSeparator, DataFactoryElement<string> encodingName, DataFactoryElement<string> jsonNodeReference, BinaryData jsonPathDefinition) : base(datasetStorageFormatType, serializer, deserializer, additionalProperties)
+        internal DatasetJsonFormat(string datasetStorageFormatType, DataFactoryElement<string> serializer, DataFactoryElement<string> deserializer, IDictionary<string, DataFactoryElement<string>> additionalProperties, BinaryData filePattern, DataFactoryElement<string> nestingSeparator, DataFactoryElement<string> encodingName, DataFactoryElement<string> jsonNodeReference, BinaryData jsonPathDefinition) : base(datasetStorageFormatType, serializer, deserializer, additionalProperties)
         {
             FilePattern = filePattern;
             NestingSeparator = nestingSeparator;
diff --git a/src/AzureDataFactory.TestingFramework/Generated/Models/DatasetLocation.cs b/src/AzureDataFactory.TestingFramework/Generated/Models/DatasetLocation.cs
index d55e34a5..15b26c69 100644
--- a/src/AzureDataFactory.TestingFramework/Generated/Models/DatasetLocation.cs
+++ b/src/AzureDataFactory.TestingFramework/Generated/Models/DatasetLocation.cs
@@ -20,7 +20,7 @@ public partial class DatasetLocation
         /// <summary> Initializes a new instance of DatasetLocation. </summary>
         public DatasetLocation()
         {
-            AdditionalProperties = new ChangeTrackingDictionary<string, BinaryData>();
+            AdditionalProperties = new ChangeTrackingDictionary<string, DataFactoryElement<string>>();
         }
 
         /// <summary> Initializes a new instance of DatasetLocation. </summary>
@@ -28,7 +28,7 @@ public DatasetLocation()
         /// <param name="folderPath"> Specify the folder path of dataset. Type: string (or Expression with resultType string). </param>
         /// <param name="fileName"> Specify the file name of dataset. Type: string (or Expression with resultType string). </param>
         /// <param name="additionalProperties"> Additional Properties. </param>
-        internal DatasetLocation(string datasetLocationType, DataFactoryElement<string> folderPath, DataFactoryElement<string> fileName, IDictionary<string, BinaryData> additionalProperties)
+        internal DatasetLocation(string datasetLocationType, DataFactoryElement<string> folderPath, DataFactoryElement<string> fileName, IDictionary<string, DataFactoryElement<string>> additionalProperties)
         {
             DatasetLocationType = datasetLocationType;
             FolderPath = folderPath;
@@ -72,6 +72,6 @@ internal DatasetLocation(string datasetLocationType, DataFactoryElement<string>
         /// </list>
         /// </para>
         /// </summary>
-        public IDictionary<string, BinaryData> AdditionalProperties { get; }
+        public IDictionary<string, DataFactoryElement<string>> AdditionalProperties { get; }
     }
 }
diff --git a/src/AzureDataFactory.TestingFramework/Generated/Models/DatasetOrcFormat.Serialization.cs b/src/AzureDataFactory.TestingFramework/Generated/Models/DatasetOrcFormat.Serialization.cs
index 9b49dbc2..c2714d41 100644
--- a/src/AzureDataFactory.TestingFramework/Generated/Models/DatasetOrcFormat.Serialization.cs
+++ b/src/AzureDataFactory.TestingFramework/Generated/Models/DatasetOrcFormat.Serialization.cs
@@ -49,8 +49,8 @@ internal static DatasetOrcFormat DeserializeDatasetOrcFormat(JsonElement element
             string type = default;
             Optional<DataFactoryElement<string>> serializer = default;
             Optional<DataFactoryElement<string>> deserializer = default;
-            IDictionary<string, BinaryData> additionalProperties = default;
-            Dictionary<string, BinaryData> additionalPropertiesDictionary = new Dictionary<string, BinaryData>();
+            IDictionary<string, DataFactoryElement<string>> additionalProperties = default;
+            Dictionary<string, DataFactoryElement<string>> additionalPropertiesDictionary = new Dictionary<string, DataFactoryElement<string>>();
             foreach (var property in element.EnumerateObject())
             {
                 if (property.NameEquals("type"u8))
@@ -76,7 +76,7 @@ internal static DatasetOrcFormat DeserializeDatasetOrcFormat(JsonElement element
                     deserializer = JsonSerializer.Deserialize<DataFactoryElement<string>>(property.Value.GetRawText());
                     continue;
                 }
-                additionalPropertiesDictionary.Add(property.Name, BinaryData.FromString(property.Value.GetRawText()));
+                additionalPropertiesDictionary.Add(property.Name, JsonSerializer.Deserialize<DataFactoryElement<string>>(property.Value.GetRawText()));
             }
             additionalProperties = additionalPropertiesDictionary;
             return new DatasetOrcFormat(type, serializer.Value, deserializer.Value, additionalProperties);
diff --git a/src/AzureDataFactory.TestingFramework/Generated/Models/DatasetOrcFormat.cs b/src/AzureDataFactory.TestingFramework/Generated/Models/DatasetOrcFormat.cs
index 49f1f809..13d6d179 100644
--- a/src/AzureDataFactory.TestingFramework/Generated/Models/DatasetOrcFormat.cs
+++ b/src/AzureDataFactory.TestingFramework/Generated/Models/DatasetOrcFormat.cs
@@ -23,7 +23,7 @@ public DatasetOrcFormat()
         /// <param name="serializer"> Serializer. Type: string (or Expression with resultType string). </param>
         /// <param name="deserializer"> Deserializer. Type: string (or Expression with resultType string). </param>
         /// <param name="additionalProperties"> Additional Properties. </param>
-        internal DatasetOrcFormat(string datasetStorageFormatType, DataFactoryElement<string> serializer, DataFactoryElement<string> deserializer, IDictionary<string, BinaryData> additionalProperties) : base(datasetStorageFormatType, serializer, deserializer, additionalProperties)
+        internal DatasetOrcFormat(string datasetStorageFormatType, DataFactoryElement<string> serializer, DataFactoryElement<string> deserializer, IDictionary<string, DataFactoryElement<string>> additionalProperties) : base(datasetStorageFormatType, serializer, deserializer, additionalProperties)
         {
             DatasetStorageFormatType = datasetStorageFormatType ?? "OrcFormat";
         }
diff --git a/src/AzureDataFactory.TestingFramework/Generated/Models/DatasetParquetFormat.Serialization.cs b/src/AzureDataFactory.TestingFramework/Generated/Models/DatasetParquetFormat.Serialization.cs
index fe7454ad..f69e3934 100644
--- a/src/AzureDataFactory.TestingFramework/Generated/Models/DatasetParquetFormat.Serialization.cs
+++ b/src/AzureDataFactory.TestingFramework/Generated/Models/DatasetParquetFormat.Serialization.cs
@@ -49,8 +49,8 @@ internal static DatasetParquetFormat DeserializeDatasetParquetFormat(JsonElement
             string type = default;
             Optional<DataFactoryElement<string>> serializer = default;
             Optional<DataFactoryElement<string>> deserializer = default;
-            IDictionary<string, BinaryData> additionalProperties = default;
-            Dictionary<string, BinaryData> additionalPropertiesDictionary = new Dictionary<string, BinaryData>();
+            IDictionary<string, DataFactoryElement<string>> additionalProperties = default;
+            Dictionary<string, DataFactoryElement<string>> additionalPropertiesDictionary = new Dictionary<string, DataFactoryElement<string>>();
             foreach (var property in element.EnumerateObject())
             {
                 if (property.NameEquals("type"u8))
@@ -76,7 +76,7 @@ internal static DatasetParquetFormat DeserializeDatasetParquetFormat(JsonElement
                     deserializer = JsonSerializer.Deserialize<DataFactoryElement<string>>(property.Value.GetRawText());
                     continue;
                 }
-                additionalPropertiesDictionary.Add(property.Name, BinaryData.FromString(property.Value.GetRawText()));
+                additionalPropertiesDictionary.Add(property.Name, JsonSerializer.Deserialize<DataFactoryElement<string>>(property.Value.GetRawText()));
             }
             additionalProperties = additionalPropertiesDictionary;
             return new DatasetParquetFormat(type, serializer.Value, deserializer.Value, additionalProperties);
diff --git a/src/AzureDataFactory.TestingFramework/Generated/Models/DatasetParquetFormat.cs b/src/AzureDataFactory.TestingFramework/Generated/Models/DatasetParquetFormat.cs
index 9fd9023c..e2f21f17 100644
--- a/src/AzureDataFactory.TestingFramework/Generated/Models/DatasetParquetFormat.cs
+++ b/src/AzureDataFactory.TestingFramework/Generated/Models/DatasetParquetFormat.cs
@@ -23,7 +23,7 @@ public DatasetParquetFormat()
         /// <param name="serializer"> Serializer. Type: string (or Expression with resultType string). </param>
         /// <param name="deserializer"> Deserializer. Type: string (or Expression with resultType string). </param>
         /// <param name="additionalProperties"> Additional Properties. </param>
-        internal DatasetParquetFormat(string datasetStorageFormatType, DataFactoryElement<string> serializer, DataFactoryElement<string> deserializer, IDictionary<string, BinaryData> additionalProperties) : base(datasetStorageFormatType, serializer, deserializer, additionalProperties)
+        internal DatasetParquetFormat(string datasetStorageFormatType, DataFactoryElement<string> serializer, DataFactoryElement<string> deserializer, IDictionary<string, DataFactoryElement<string>> additionalProperties) : base(datasetStorageFormatType, serializer, deserializer, additionalProperties)
         {
             DatasetStorageFormatType = datasetStorageFormatType ?? "ParquetFormat";
         }
diff --git a/src/AzureDataFactory.TestingFramework/Generated/Models/DatasetReference.Serialization.cs b/src/AzureDataFactory.TestingFramework/Generated/Models/DatasetReference.Serialization.cs
index a473e1f7..8f902c33 100644
--- a/src/AzureDataFactory.TestingFramework/Generated/Models/DatasetReference.Serialization.cs
+++ b/src/AzureDataFactory.TestingFramework/Generated/Models/DatasetReference.Serialization.cs
@@ -7,6 +7,7 @@
 
 using System.Text.Json;
 using Azure.Core;
+using Azure.Core.Expressions.DataFactory;
 
 namespace AzureDataFactory.TestingFramework.Models
 {
@@ -50,7 +51,7 @@ internal static DatasetReference DeserializeDatasetReference(JsonElement element
             }
             DatasetReferenceType type = default;
             string referenceName = default;
-            Optional<IDictionary<string, BinaryData>> parameters = default;
+            Optional<IDictionary<string, DataFactoryElement<string>>> parameters = default;
             foreach (var property in element.EnumerateObject())
             {
                 if (property.NameEquals("type"u8))
@@ -69,7 +70,7 @@ internal static DatasetReference DeserializeDatasetReference(JsonElement element
                     {
                         continue;
                     }
-                    Dictionary<string, BinaryData> dictionary = new Dictionary<string, BinaryData>();
+                    Dictionary<string, DataFactoryElement<string>> dictionary = new Dictionary<string, DataFactoryElement<string>>();
                     foreach (var property0 in property.Value.EnumerateObject())
                     {
                         if (property0.Value.ValueKind == JsonValueKind.Null)
@@ -78,7 +79,7 @@ internal static DatasetReference DeserializeDatasetReference(JsonElement element
                         }
                         else
                         {
-                            dictionary.Add(property0.Name, BinaryData.FromString(property0.Value.GetRawText()));
+                            dictionary.Add(property0.Name, JsonSerializer.Deserialize<DataFactoryElement<string>>(property0.Value.GetRawText()));
                         }
                     }
                     parameters = dictionary;
diff --git a/src/AzureDataFactory.TestingFramework/Generated/Models/DatasetReference.cs b/src/AzureDataFactory.TestingFramework/Generated/Models/DatasetReference.cs
index c91db257..89d16110 100644
--- a/src/AzureDataFactory.TestingFramework/Generated/Models/DatasetReference.cs
+++ b/src/AzureDataFactory.TestingFramework/Generated/Models/DatasetReference.cs
@@ -6,6 +6,7 @@
 #nullable disable
 
 using Azure.Core;
+using Azure.Core.Expressions.DataFactory;
 
 namespace AzureDataFactory.TestingFramework.Models
 {
@@ -22,14 +23,14 @@ public DatasetReference(DatasetReferenceType referenceType, string referenceName
 
             ReferenceType = referenceType;
             ReferenceName = referenceName;
-            Parameters = new ChangeTrackingDictionary<string, BinaryData>();
+            Parameters = new ChangeTrackingDictionary<string, DataFactoryElement<string>>();
         }
 
         /// <summary> Initializes a new instance of DatasetReference. </summary>
         /// <param name="referenceType"> Dataset reference type. </param>
         /// <param name="referenceName"> Reference dataset name. </param>
         /// <param name="parameters"> Arguments for dataset. </param>
-        internal DatasetReference(DatasetReferenceType referenceType, string referenceName, IDictionary<string, BinaryData> parameters)
+        internal DatasetReference(DatasetReferenceType referenceType, string referenceName, IDictionary<string, DataFactoryElement<string>> parameters)
         {
             ReferenceType = referenceType;
             ReferenceName = referenceName;
@@ -70,6 +71,6 @@ internal DatasetReference(DatasetReferenceType referenceType, string referenceNa
         /// </list>
         /// </para>
         /// </summary>
-        public IDictionary<string, BinaryData> Parameters { get; }
+        public IDictionary<string, DataFactoryElement<string>> Parameters { get; }
     }
 }
diff --git a/src/AzureDataFactory.TestingFramework/Generated/Models/DatasetSchemaDataElement.Serialization.cs b/src/AzureDataFactory.TestingFramework/Generated/Models/DatasetSchemaDataElement.Serialization.cs
index cd99a6d3..f035cfb7 100644
--- a/src/AzureDataFactory.TestingFramework/Generated/Models/DatasetSchemaDataElement.Serialization.cs
+++ b/src/AzureDataFactory.TestingFramework/Generated/Models/DatasetSchemaDataElement.Serialization.cs
@@ -48,8 +48,8 @@ internal static DatasetSchemaDataElement DeserializeDatasetSchemaDataElement(Jso
             }
             Optional<DataFactoryElement<string>> name = default;
             Optional<DataFactoryElement<string>> type = default;
-            IDictionary<string, BinaryData> additionalProperties = default;
-            Dictionary<string, BinaryData> additionalPropertiesDictionary = new Dictionary<string, BinaryData>();
+            IDictionary<string, DataFactoryElement<string>> additionalProperties = default;
+            Dictionary<string, DataFactoryElement<string>> additionalPropertiesDictionary = new Dictionary<string, DataFactoryElement<string>>();
             foreach (var property in element.EnumerateObject())
             {
                 if (property.NameEquals("name"u8))
@@ -70,7 +70,7 @@ internal static DatasetSchemaDataElement DeserializeDatasetSchemaDataElement(Jso
                     type = JsonSerializer.Deserialize<DataFactoryElement<string>>(property.Value.GetRawText());
                     continue;
                 }
-                additionalPropertiesDictionary.Add(property.Name, BinaryData.FromString(property.Value.GetRawText()));
+                additionalPropertiesDictionary.Add(property.Name, JsonSerializer.Deserialize<DataFactoryElement<string>>(property.Value.GetRawText()));
             }
             additionalProperties = additionalPropertiesDictionary;
             return new DatasetSchemaDataElement(name.Value, type.Value, additionalProperties);
diff --git a/src/AzureDataFactory.TestingFramework/Generated/Models/DatasetSchemaDataElement.cs b/src/AzureDataFactory.TestingFramework/Generated/Models/DatasetSchemaDataElement.cs
index 87ef51d1..14873486 100644
--- a/src/AzureDataFactory.TestingFramework/Generated/Models/DatasetSchemaDataElement.cs
+++ b/src/AzureDataFactory.TestingFramework/Generated/Models/DatasetSchemaDataElement.cs
@@ -16,14 +16,14 @@ public partial class DatasetSchemaDataElement
         /// <summary> Initializes a new instance of DatasetSchemaDataElement. </summary>
         public DatasetSchemaDataElement()
         {
-            AdditionalProperties = new ChangeTrackingDictionary<string, BinaryData>();
+            AdditionalProperties = new ChangeTrackingDictionary<string, DataFactoryElement<string>>();
         }
 
         /// <summary> Initializes a new instance of DatasetSchemaDataElement. </summary>
         /// <param name="schemaColumnName"> Name of the schema column. Type: string (or Expression with resultType string). </param>
         /// <param name="schemaColumnType"> Type of the schema column. Type: string (or Expression with resultType string). </param>
         /// <param name="additionalProperties"> Additional Properties. </param>
-        internal DatasetSchemaDataElement(DataFactoryElement<string> schemaColumnName, DataFactoryElement<string> schemaColumnType, IDictionary<string, BinaryData> additionalProperties)
+        internal DatasetSchemaDataElement(DataFactoryElement<string> schemaColumnName, DataFactoryElement<string> schemaColumnType, IDictionary<string, DataFactoryElement<string>> additionalProperties)
         {
             SchemaColumnName = schemaColumnName;
             SchemaColumnType = schemaColumnType;
@@ -64,6 +64,6 @@ internal DatasetSchemaDataElement(DataFactoryElement<string> schemaColumnName, D
         /// </list>
         /// </para>
         /// </summary>
-        public IDictionary<string, BinaryData> AdditionalProperties { get; }
+        public IDictionary<string, DataFactoryElement<string>> AdditionalProperties { get; }
     }
 }
diff --git a/src/AzureDataFactory.TestingFramework/Generated/Models/DatasetStorageFormat.cs b/src/AzureDataFactory.TestingFramework/Generated/Models/DatasetStorageFormat.cs
index fb243a3b..8e0073c8 100644
--- a/src/AzureDataFactory.TestingFramework/Generated/Models/DatasetStorageFormat.cs
+++ b/src/AzureDataFactory.TestingFramework/Generated/Models/DatasetStorageFormat.cs
@@ -20,7 +20,7 @@ public partial class DatasetStorageFormat
         /// <summary> Initializes a new instance of DatasetStorageFormat. </summary>
         public DatasetStorageFormat()
         {
-            AdditionalProperties = new ChangeTrackingDictionary<string, BinaryData>();
+            AdditionalProperties = new ChangeTrackingDictionary<string, DataFactoryElement<string>>();
         }
 
         /// <summary> Initializes a new instance of DatasetStorageFormat. </summary>
@@ -28,7 +28,7 @@ public DatasetStorageFormat()
         /// <param name="serializer"> Serializer. Type: string (or Expression with resultType string). </param>
         /// <param name="deserializer"> Deserializer. Type: string (or Expression with resultType string). </param>
         /// <param name="additionalProperties"> Additional Properties. </param>
-        internal DatasetStorageFormat(string datasetStorageFormatType, DataFactoryElement<string> serializer, DataFactoryElement<string> deserializer, IDictionary<string, BinaryData> additionalProperties)
+        internal DatasetStorageFormat(string datasetStorageFormatType, DataFactoryElement<string> serializer, DataFactoryElement<string> deserializer, IDictionary<string, DataFactoryElement<string>> additionalProperties)
         {
             DatasetStorageFormatType = datasetStorageFormatType;
             Serializer = serializer;
@@ -72,6 +72,6 @@ internal DatasetStorageFormat(string datasetStorageFormatType, DataFactoryElemen
         /// </list>
         /// </para>
         /// </summary>
-        public IDictionary<string, BinaryData> AdditionalProperties { get; }
+        public IDictionary<string, DataFactoryElement<string>> AdditionalProperties { get; }
     }
 }
diff --git a/src/AzureDataFactory.TestingFramework/Generated/Models/DatasetTextFormat.Serialization.cs b/src/AzureDataFactory.TestingFramework/Generated/Models/DatasetTextFormat.Serialization.cs
index 49efc72e..8f998e2f 100644
--- a/src/AzureDataFactory.TestingFramework/Generated/Models/DatasetTextFormat.Serialization.cs
+++ b/src/AzureDataFactory.TestingFramework/Generated/Models/DatasetTextFormat.Serialization.cs
@@ -103,8 +103,8 @@ internal static DatasetTextFormat DeserializeDatasetTextFormat(JsonElement eleme
             string type = default;
             Optional<DataFactoryElement<string>> serializer = default;
             Optional<DataFactoryElement<string>> deserializer = default;
-            IDictionary<string, BinaryData> additionalProperties = default;
-            Dictionary<string, BinaryData> additionalPropertiesDictionary = new Dictionary<string, BinaryData>();
+            IDictionary<string, DataFactoryElement<string>> additionalProperties = default;
+            Dictionary<string, DataFactoryElement<string>> additionalPropertiesDictionary = new Dictionary<string, DataFactoryElement<string>>();
             foreach (var property in element.EnumerateObject())
             {
                 if (property.NameEquals("columnDelimiter"u8))
@@ -211,7 +211,7 @@ internal static DatasetTextFormat DeserializeDatasetTextFormat(JsonElement eleme
                     deserializer = JsonSerializer.Deserialize<DataFactoryElement<string>>(property.Value.GetRawText());
                     continue;
                 }
-                additionalPropertiesDictionary.Add(property.Name, BinaryData.FromString(property.Value.GetRawText()));
+                additionalPropertiesDictionary.Add(property.Name, JsonSerializer.Deserialize<DataFactoryElement<string>>(property.Value.GetRawText()));
             }
             additionalProperties = additionalPropertiesDictionary;
             return new DatasetTextFormat(type, serializer.Value, deserializer.Value, additionalProperties, columnDelimiter.Value, rowDelimiter.Value, escapeChar.Value, quoteChar.Value, nullValue.Value, encodingName.Value, treatEmptyAsNull.Value, skipLineCount.Value, firstRowAsHeader.Value);
diff --git a/src/AzureDataFactory.TestingFramework/Generated/Models/DatasetTextFormat.cs b/src/AzureDataFactory.TestingFramework/Generated/Models/DatasetTextFormat.cs
index df3e80a4..85ea5780 100644
--- a/src/AzureDataFactory.TestingFramework/Generated/Models/DatasetTextFormat.cs
+++ b/src/AzureDataFactory.TestingFramework/Generated/Models/DatasetTextFormat.cs
@@ -32,7 +32,7 @@ public DatasetTextFormat()
         /// <param name="treatEmptyAsNull"> Treat empty column values in the text file as null. The default value is true. Type: boolean (or Expression with resultType boolean). </param>
         /// <param name="skipLineCount"> The number of lines/rows to be skipped when parsing text files. The default value is 0. Type: integer (or Expression with resultType integer). </param>
         /// <param name="firstRowAsHeader"> When used as input, treat the first row of data as headers. When used as output,write the headers into the output as the first row of data. The default value is false. Type: boolean (or Expression with resultType boolean). </param>
-        internal DatasetTextFormat(string datasetStorageFormatType, DataFactoryElement<string> serializer, DataFactoryElement<string> deserializer, IDictionary<string, BinaryData> additionalProperties, DataFactoryElement<string> columnDelimiter, DataFactoryElement<string> rowDelimiter, DataFactoryElement<string> escapeChar, DataFactoryElement<string> quoteChar, DataFactoryElement<string> nullValue, DataFactoryElement<string> encodingName, DataFactoryElement<bool> treatEmptyAsNull, DataFactoryElement<int> skipLineCount, DataFactoryElement<bool> firstRowAsHeader) : base(datasetStorageFormatType, serializer, deserializer, additionalProperties)
+        internal DatasetTextFormat(string datasetStorageFormatType, DataFactoryElement<string> serializer, DataFactoryElement<string> deserializer, IDictionary<string, DataFactoryElement<string>> additionalProperties, DataFactoryElement<string> columnDelimiter, DataFactoryElement<string> rowDelimiter, DataFactoryElement<string> escapeChar, DataFactoryElement<string> quoteChar, DataFactoryElement<string> nullValue, DataFactoryElement<string> encodingName, DataFactoryElement<bool> treatEmptyAsNull, DataFactoryElement<int> skipLineCount, DataFactoryElement<bool> firstRowAsHeader) : base(datasetStorageFormatType, serializer, deserializer, additionalProperties)
         {
             ColumnDelimiter = columnDelimiter;
             RowDelimiter = rowDelimiter;
diff --git a/src/AzureDataFactory.TestingFramework/Generated/Models/DataworldLinkedService.Serialization.cs b/src/AzureDataFactory.TestingFramework/Generated/Models/DataworldLinkedService.Serialization.cs
index 0e36b03a..1b226892 100644
--- a/src/AzureDataFactory.TestingFramework/Generated/Models/DataworldLinkedService.Serialization.cs
+++ b/src/AzureDataFactory.TestingFramework/Generated/Models/DataworldLinkedService.Serialization.cs
@@ -92,8 +92,8 @@ internal static DataworldLinkedService DeserializeDataworldLinkedService(JsonEle
             Optional<IList<BinaryData>> annotations = default;
             DataFactorySecretBaseDefinition apiToken = default;
             Optional<string> encryptedCredential = default;
-            IDictionary<string, BinaryData> additionalProperties = default;
-            Dictionary<string, BinaryData> additionalPropertiesDictionary = new Dictionary<string, BinaryData>();
+            IDictionary<string, DataFactoryElement<string>> additionalProperties = default;
+            Dictionary<string, DataFactoryElement<string>> additionalPropertiesDictionary = new Dictionary<string, DataFactoryElement<string>>();
             foreach (var property in element.EnumerateObject())
             {
                 if (property.NameEquals("type"u8))
@@ -172,7 +172,7 @@ internal static DataworldLinkedService DeserializeDataworldLinkedService(JsonEle
                     }
                     continue;
                 }
-                additionalPropertiesDictionary.Add(property.Name, BinaryData.FromString(property.Value.GetRawText()));
+                additionalPropertiesDictionary.Add(property.Name, JsonSerializer.Deserialize<DataFactoryElement<string>>(property.Value.GetRawText()));
             }
             additionalProperties = additionalPropertiesDictionary;
             return new DataworldLinkedService(type, connectVia.Value, description.Value, Optional.ToDictionary(parameters), Optional.ToList(annotations), additionalProperties, apiToken, encryptedCredential.Value);
diff --git a/src/AzureDataFactory.TestingFramework/Generated/Models/DataworldLinkedService.cs b/src/AzureDataFactory.TestingFramework/Generated/Models/DataworldLinkedService.cs
index 9ac3fe57..e05ff323 100644
--- a/src/AzureDataFactory.TestingFramework/Generated/Models/DataworldLinkedService.cs
+++ b/src/AzureDataFactory.TestingFramework/Generated/Models/DataworldLinkedService.cs
@@ -33,7 +33,7 @@ public DataworldLinkedService(DataFactorySecretBaseDefinition apiToken)
         /// <param name="additionalProperties"> Additional Properties. </param>
         /// <param name="apiToken"> The api token for the Dataworld source. </param>
         /// <param name="encryptedCredential"> The encrypted credential used for authentication. Credentials are encrypted using the integration runtime credential manager. Type: string. </param>
-        internal DataworldLinkedService(string linkedServiceType, IntegrationRuntimeReference connectVia, string description, IDictionary<string, EntityParameterSpecification> parameters, IList<BinaryData> annotations, IDictionary<string, BinaryData> additionalProperties, DataFactorySecretBaseDefinition apiToken, string encryptedCredential) : base(linkedServiceType, connectVia, description, parameters, annotations, additionalProperties)
+        internal DataworldLinkedService(string linkedServiceType, IntegrationRuntimeReference connectVia, string description, IDictionary<string, EntityParameterSpecification> parameters, IList<BinaryData> annotations, IDictionary<string, DataFactoryElement<string>> additionalProperties, DataFactorySecretBaseDefinition apiToken, string encryptedCredential) : base(linkedServiceType, connectVia, description, parameters, annotations, additionalProperties)
         {
             ApiToken = apiToken;
             EncryptedCredential = encryptedCredential;
diff --git a/src/AzureDataFactory.TestingFramework/Generated/Models/Db2LinkedService.Serialization.cs b/src/AzureDataFactory.TestingFramework/Generated/Models/Db2LinkedService.Serialization.cs
index 7a16afad..a8360e94 100644
--- a/src/AzureDataFactory.TestingFramework/Generated/Models/Db2LinkedService.Serialization.cs
+++ b/src/AzureDataFactory.TestingFramework/Generated/Models/Db2LinkedService.Serialization.cs
@@ -138,8 +138,8 @@ internal static Db2LinkedService DeserializeDb2LinkedService(JsonElement element
             Optional<DataFactoryElement<string>> packageCollection = default;
             Optional<DataFactoryElement<string>> certificateCommonName = default;
             Optional<string> encryptedCredential = default;
-            IDictionary<string, BinaryData> additionalProperties = default;
-            Dictionary<string, BinaryData> additionalPropertiesDictionary = new Dictionary<string, BinaryData>();
+            IDictionary<string, DataFactoryElement<string>> additionalProperties = default;
+            Dictionary<string, DataFactoryElement<string>> additionalPropertiesDictionary = new Dictionary<string, DataFactoryElement<string>>();
             foreach (var property in element.EnumerateObject())
             {
                 if (property.NameEquals("type"u8))
@@ -285,7 +285,7 @@ internal static Db2LinkedService DeserializeDb2LinkedService(JsonElement element
                     }
                     continue;
                 }
-                additionalPropertiesDictionary.Add(property.Name, BinaryData.FromString(property.Value.GetRawText()));
+                additionalPropertiesDictionary.Add(property.Name, JsonSerializer.Deserialize<DataFactoryElement<string>>(property.Value.GetRawText()));
             }
             additionalProperties = additionalPropertiesDictionary;
             return new Db2LinkedService(type, connectVia.Value, description.Value, Optional.ToDictionary(parameters), Optional.ToList(annotations), additionalProperties, connectionString.Value, server.Value, database.Value, Optional.ToNullable(authenticationType), username.Value, password, packageCollection.Value, certificateCommonName.Value, encryptedCredential.Value);
diff --git a/src/AzureDataFactory.TestingFramework/Generated/Models/Db2LinkedService.cs b/src/AzureDataFactory.TestingFramework/Generated/Models/Db2LinkedService.cs
index 3db5a227..93c6e53a 100644
--- a/src/AzureDataFactory.TestingFramework/Generated/Models/Db2LinkedService.cs
+++ b/src/AzureDataFactory.TestingFramework/Generated/Models/Db2LinkedService.cs
@@ -34,7 +34,7 @@ public Db2LinkedService()
         /// <param name="packageCollection"> Under where packages are created when querying database. It is mutually exclusive with connectionString property. Type: string (or Expression with resultType string). </param>
         /// <param name="certificateCommonName"> Certificate Common Name when TLS is enabled. It is mutually exclusive with connectionString property. Type: string (or Expression with resultType string). </param>
         /// <param name="encryptedCredential"> The encrypted credential used for authentication. Credentials are encrypted using the integration runtime credential manager. It is mutually exclusive with connectionString property. Type: string. </param>
-        internal Db2LinkedService(string linkedServiceType, IntegrationRuntimeReference connectVia, string description, IDictionary<string, EntityParameterSpecification> parameters, IList<BinaryData> annotations, IDictionary<string, BinaryData> additionalProperties, DataFactoryElement<string> connectionString, DataFactoryElement<string> server, DataFactoryElement<string> database, Db2AuthenticationType? authenticationType, DataFactoryElement<string> username, DataFactorySecretBaseDefinition password, DataFactoryElement<string> packageCollection, DataFactoryElement<string> certificateCommonName, string encryptedCredential) : base(linkedServiceType, connectVia, description, parameters, annotations, additionalProperties)
+        internal Db2LinkedService(string linkedServiceType, IntegrationRuntimeReference connectVia, string description, IDictionary<string, EntityParameterSpecification> parameters, IList<BinaryData> annotations, IDictionary<string, DataFactoryElement<string>> additionalProperties, DataFactoryElement<string> connectionString, DataFactoryElement<string> server, DataFactoryElement<string> database, Db2AuthenticationType? authenticationType, DataFactoryElement<string> username, DataFactorySecretBaseDefinition password, DataFactoryElement<string> packageCollection, DataFactoryElement<string> certificateCommonName, string encryptedCredential) : base(linkedServiceType, connectVia, description, parameters, annotations, additionalProperties)
         {
             ConnectionString = connectionString;
             Server = server;
diff --git a/src/AzureDataFactory.TestingFramework/Generated/Models/Db2Source.Serialization.cs b/src/AzureDataFactory.TestingFramework/Generated/Models/Db2Source.Serialization.cs
index ca46638b..3ea8e516 100644
--- a/src/AzureDataFactory.TestingFramework/Generated/Models/Db2Source.Serialization.cs
+++ b/src/AzureDataFactory.TestingFramework/Generated/Models/Db2Source.Serialization.cs
@@ -83,8 +83,8 @@ internal static Db2Source DeserializeDb2Source(JsonElement element)
             Optional<DataFactoryElement<string>> sourceRetryWait = default;
             Optional<DataFactoryElement<int>> maxConcurrentConnections = default;
             Optional<DataFactoryElement<bool>> disableMetricsCollection = default;
-            IDictionary<string, BinaryData> additionalProperties = default;
-            Dictionary<string, BinaryData> additionalPropertiesDictionary = new Dictionary<string, BinaryData>();
+            IDictionary<string, DataFactoryElement<string>> additionalProperties = default;
+            Dictionary<string, DataFactoryElement<string>> additionalPropertiesDictionary = new Dictionary<string, DataFactoryElement<string>>();
             foreach (var property in element.EnumerateObject())
             {
                 if (property.NameEquals("query"u8))
@@ -155,7 +155,7 @@ internal static Db2Source DeserializeDb2Source(JsonElement element)
                     disableMetricsCollection = JsonSerializer.Deserialize<DataFactoryElement<bool>>(property.Value.GetRawText());
                     continue;
                 }
-                additionalPropertiesDictionary.Add(property.Name, BinaryData.FromString(property.Value.GetRawText()));
+                additionalPropertiesDictionary.Add(property.Name, JsonSerializer.Deserialize<DataFactoryElement<string>>(property.Value.GetRawText()));
             }
             additionalProperties = additionalPropertiesDictionary;
             return new Db2Source(type, sourceRetryCount.Value, sourceRetryWait.Value, maxConcurrentConnections.Value, disableMetricsCollection.Value, additionalProperties, queryTimeout.Value, additionalColumns.Value, query.Value);
diff --git a/src/AzureDataFactory.TestingFramework/Generated/Models/Db2Source.cs b/src/AzureDataFactory.TestingFramework/Generated/Models/Db2Source.cs
index c135f7b5..2d7b007c 100644
--- a/src/AzureDataFactory.TestingFramework/Generated/Models/Db2Source.cs
+++ b/src/AzureDataFactory.TestingFramework/Generated/Models/Db2Source.cs
@@ -28,7 +28,7 @@ public Db2Source()
         /// <param name="queryTimeout"> Query timeout. Type: string (or Expression with resultType string), pattern: ((\d+)\.)?(\d\d):(60|([0-5][0-9])):(60|([0-5][0-9])). </param>
         /// <param name="additionalColumns"> Specifies the additional columns to be added to source data. Type: array of objects(AdditionalColumns) (or Expression with resultType array of objects). </param>
         /// <param name="query"> Database query. Type: string (or Expression with resultType string). </param>
-        internal Db2Source(string copySourceType, DataFactoryElement<int> sourceRetryCount, DataFactoryElement<string> sourceRetryWait, DataFactoryElement<int> maxConcurrentConnections, DataFactoryElement<bool> disableMetricsCollection, IDictionary<string, BinaryData> additionalProperties, DataFactoryElement<string> queryTimeout, BinaryData additionalColumns, DataFactoryElement<string> query) : base(copySourceType, sourceRetryCount, sourceRetryWait, maxConcurrentConnections, disableMetricsCollection, additionalProperties, queryTimeout, additionalColumns)
+        internal Db2Source(string copySourceType, DataFactoryElement<int> sourceRetryCount, DataFactoryElement<string> sourceRetryWait, DataFactoryElement<int> maxConcurrentConnections, DataFactoryElement<bool> disableMetricsCollection, IDictionary<string, DataFactoryElement<string>> additionalProperties, DataFactoryElement<string> queryTimeout, BinaryData additionalColumns, DataFactoryElement<string> query) : base(copySourceType, sourceRetryCount, sourceRetryWait, maxConcurrentConnections, disableMetricsCollection, additionalProperties, queryTimeout, additionalColumns)
         {
             Query = query;
             CopySourceType = copySourceType ?? "Db2Source";
diff --git a/src/AzureDataFactory.TestingFramework/Generated/Models/Db2TableDataset.Serialization.cs b/src/AzureDataFactory.TestingFramework/Generated/Models/Db2TableDataset.Serialization.cs
index e0173618..10667fab 100644
--- a/src/AzureDataFactory.TestingFramework/Generated/Models/Db2TableDataset.Serialization.cs
+++ b/src/AzureDataFactory.TestingFramework/Generated/Models/Db2TableDataset.Serialization.cs
@@ -120,8 +120,8 @@ internal static Db2TableDataset DeserializeDb2TableDataset(JsonElement element)
             Optional<BinaryData> tableName = default;
             Optional<DataFactoryElement<string>> schema0 = default;
             Optional<DataFactoryElement<string>> table = default;
-            IDictionary<string, BinaryData> additionalProperties = default;
-            Dictionary<string, BinaryData> additionalPropertiesDictionary = new Dictionary<string, BinaryData>();
+            IDictionary<string, DataFactoryElement<string>> additionalProperties = default;
+            Dictionary<string, DataFactoryElement<string>> additionalPropertiesDictionary = new Dictionary<string, DataFactoryElement<string>>();
             foreach (var property in element.EnumerateObject())
             {
                 if (property.NameEquals("type"u8))
@@ -240,7 +240,7 @@ internal static Db2TableDataset DeserializeDb2TableDataset(JsonElement element)
                     }
                     continue;
                 }
-                additionalPropertiesDictionary.Add(property.Name, BinaryData.FromString(property.Value.GetRawText()));
+                additionalPropertiesDictionary.Add(property.Name, JsonSerializer.Deserialize<DataFactoryElement<string>>(property.Value.GetRawText()));
             }
             additionalProperties = additionalPropertiesDictionary;
             return new Db2TableDataset(type, description.Value, structure.Value, schema.Value, linkedServiceName, Optional.ToDictionary(parameters), Optional.ToList(annotations), folder.Value, additionalProperties, tableName.Value, schema0.Value, table.Value);
diff --git a/src/AzureDataFactory.TestingFramework/Generated/Models/Db2TableDataset.cs b/src/AzureDataFactory.TestingFramework/Generated/Models/Db2TableDataset.cs
index 846f88f5..eb0cb541 100644
--- a/src/AzureDataFactory.TestingFramework/Generated/Models/Db2TableDataset.cs
+++ b/src/AzureDataFactory.TestingFramework/Generated/Models/Db2TableDataset.cs
@@ -36,7 +36,7 @@ public Db2TableDataset(DataFactoryLinkedServiceReference linkedServiceName) : ba
         /// <param name="tableName"> This property will be retired. Please consider using schema + table properties instead. </param>
         /// <param name="schemaTypePropertiesSchema"> The Db2 schema name. Type: string (or Expression with resultType string). </param>
         /// <param name="table"> The Db2 table name. Type: string (or Expression with resultType string). </param>
-        internal Db2TableDataset(string datasetType, string description, DataFactoryElement<IList<DatasetDataElement>> structure, DataFactoryElement<IList<DatasetSchemaDataElement>> schema, DataFactoryLinkedServiceReference linkedServiceName, IDictionary<string, EntityParameterSpecification> parameters, IList<BinaryData> annotations, DatasetFolder folder, IDictionary<string, BinaryData> additionalProperties, BinaryData tableName, DataFactoryElement<string> schemaTypePropertiesSchema, DataFactoryElement<string> table) : base(datasetType, description, structure, schema, linkedServiceName, parameters, annotations, folder, additionalProperties)
+        internal Db2TableDataset(string datasetType, string description, DataFactoryElement<IList<DatasetDataElement>> structure, DataFactoryElement<IList<DatasetSchemaDataElement>> schema, DataFactoryLinkedServiceReference linkedServiceName, IDictionary<string, EntityParameterSpecification> parameters, IList<BinaryData> annotations, DatasetFolder folder, IDictionary<string, DataFactoryElement<string>> additionalProperties, BinaryData tableName, DataFactoryElement<string> schemaTypePropertiesSchema, DataFactoryElement<string> table) : base(datasetType, description, structure, schema, linkedServiceName, parameters, annotations, folder, additionalProperties)
         {
             TableName = tableName;
             SchemaTypePropertiesSchema = schemaTypePropertiesSchema;
diff --git a/src/AzureDataFactory.TestingFramework/Generated/Models/DeleteActivity.Serialization.cs b/src/AzureDataFactory.TestingFramework/Generated/Models/DeleteActivity.Serialization.cs
index a17a8411..e542e7fd 100644
--- a/src/AzureDataFactory.TestingFramework/Generated/Models/DeleteActivity.Serialization.cs
+++ b/src/AzureDataFactory.TestingFramework/Generated/Models/DeleteActivity.Serialization.cs
@@ -128,8 +128,8 @@ internal static DeleteActivity DeserializeDeleteActivity(JsonElement element)
             Optional<LogStorageSettings> logStorageSettings = default;
             DatasetReference dataset = default;
             Optional<StoreReadSettings> storeSettings = default;
-            IDictionary<string, BinaryData> additionalProperties = default;
-            Dictionary<string, BinaryData> additionalPropertiesDictionary = new Dictionary<string, BinaryData>();
+            IDictionary<string, DataFactoryElement<string>> additionalProperties = default;
+            Dictionary<string, DataFactoryElement<string>> additionalPropertiesDictionary = new Dictionary<string, DataFactoryElement<string>>();
             foreach (var property in element.EnumerateObject())
             {
                 if (property.NameEquals("linkedServiceName"u8))
@@ -273,7 +273,7 @@ internal static DeleteActivity DeserializeDeleteActivity(JsonElement element)
                     }
                     continue;
                 }
-                additionalPropertiesDictionary.Add(property.Name, BinaryData.FromString(property.Value.GetRawText()));
+                additionalPropertiesDictionary.Add(property.Name, JsonSerializer.Deserialize<DataFactoryElement<string>>(property.Value.GetRawText()));
             }
             additionalProperties = additionalPropertiesDictionary;
             return new DeleteActivity(name, type, description.Value, Optional.ToNullable(state), Optional.ToNullable(onInactiveMarkAs), Optional.ToList(dependsOn), Optional.ToList(userProperties), additionalProperties, linkedServiceName, policy.Value, recursive.Value, Optional.ToNullable(maxConcurrentConnections), enableLogging.Value, logStorageSettings.Value, dataset, storeSettings.Value);
diff --git a/src/AzureDataFactory.TestingFramework/Generated/Models/DeleteActivity.cs b/src/AzureDataFactory.TestingFramework/Generated/Models/DeleteActivity.cs
index 23054e91..a1083c9c 100644
--- a/src/AzureDataFactory.TestingFramework/Generated/Models/DeleteActivity.cs
+++ b/src/AzureDataFactory.TestingFramework/Generated/Models/DeleteActivity.cs
@@ -47,7 +47,7 @@ public DeleteActivity(string name, DatasetReference dataset) : base(name)
         /// Please note <see cref="StoreReadSettings"/> is the base class. According to the scenario, a derived class of the base class might need to be assigned here, or this property needs to be casted to one of the possible derived classes.
         /// The available derived classes include <see cref="AmazonS3CompatibleReadSettings"/>, <see cref="AmazonS3ReadSettings"/>, <see cref="AzureBlobFSReadSettings"/>, <see cref="AzureBlobStorageReadSettings"/>, <see cref="AzureDataLakeStoreReadSettings"/>, <see cref="AzureFileStorageReadSettings"/>, <see cref="FileServerReadSettings"/>, <see cref="FtpReadSettings"/>, <see cref="GoogleCloudStorageReadSettings"/>, <see cref="HdfsReadSettings"/>, <see cref="HttpReadSettings"/>, <see cref="OracleCloudStorageReadSettings"/> and <see cref="SftpReadSettings"/>.
         /// </param>
-        internal DeleteActivity(string name, string activityType, string description, PipelineActivityState? state, ActivityOnInactiveMarkAs? onInactiveMarkAs, IList<PipelineActivityDependency> dependsOn, IList<PipelineActivityUserProperty> userProperties, IDictionary<string, BinaryData> additionalProperties, DataFactoryLinkedServiceReference linkedServiceName, PipelineActivityPolicy policy, DataFactoryElement<bool> recursive, int? maxConcurrentConnections, DataFactoryElement<bool> enableLogging, LogStorageSettings logStorageSettings, DatasetReference dataset, StoreReadSettings storeSettings) : base(name, activityType, description, state, onInactiveMarkAs, dependsOn, userProperties, additionalProperties, linkedServiceName, policy)
+        internal DeleteActivity(string name, string activityType, string description, PipelineActivityState? state, ActivityOnInactiveMarkAs? onInactiveMarkAs, IList<PipelineActivityDependency> dependsOn, IList<PipelineActivityUserProperty> userProperties, IDictionary<string, DataFactoryElement<string>> additionalProperties, DataFactoryLinkedServiceReference linkedServiceName, PipelineActivityPolicy policy, DataFactoryElement<bool> recursive, int? maxConcurrentConnections, DataFactoryElement<bool> enableLogging, LogStorageSettings logStorageSettings, DatasetReference dataset, StoreReadSettings storeSettings) : base(name, activityType, description, state, onInactiveMarkAs, dependsOn, userProperties, additionalProperties, linkedServiceName, policy)
         {
             Recursive = recursive;
             MaxConcurrentConnections = maxConcurrentConnections;
diff --git a/src/AzureDataFactory.TestingFramework/Generated/Models/DelimitedTextDataset.Serialization.cs b/src/AzureDataFactory.TestingFramework/Generated/Models/DelimitedTextDataset.Serialization.cs
index e8de2173..734a6857 100644
--- a/src/AzureDataFactory.TestingFramework/Generated/Models/DelimitedTextDataset.Serialization.cs
+++ b/src/AzureDataFactory.TestingFramework/Generated/Models/DelimitedTextDataset.Serialization.cs
@@ -162,8 +162,8 @@ internal static DelimitedTextDataset DeserializeDelimitedTextDataset(JsonElement
             Optional<DataFactoryElement<string>> escapeChar = default;
             Optional<DataFactoryElement<bool>> firstRowAsHeader = default;
             Optional<DataFactoryElement<string>> nullValue = default;
-            IDictionary<string, BinaryData> additionalProperties = default;
-            Dictionary<string, BinaryData> additionalPropertiesDictionary = new Dictionary<string, BinaryData>();
+            IDictionary<string, DataFactoryElement<string>> additionalProperties = default;
+            Dictionary<string, DataFactoryElement<string>> additionalPropertiesDictionary = new Dictionary<string, DataFactoryElement<string>>();
             foreach (var property in element.EnumerateObject())
             {
                 if (property.NameEquals("type"u8))
@@ -345,7 +345,7 @@ internal static DelimitedTextDataset DeserializeDelimitedTextDataset(JsonElement
                     }
                     continue;
                 }
-                additionalPropertiesDictionary.Add(property.Name, BinaryData.FromString(property.Value.GetRawText()));
+                additionalPropertiesDictionary.Add(property.Name, JsonSerializer.Deserialize<DataFactoryElement<string>>(property.Value.GetRawText()));
             }
             additionalProperties = additionalPropertiesDictionary;
             return new DelimitedTextDataset(type, description.Value, structure.Value, schema.Value, linkedServiceName, Optional.ToDictionary(parameters), Optional.ToList(annotations), folder.Value, additionalProperties, location.Value, columnDelimiter.Value, rowDelimiter.Value, encodingName.Value, compressionCodec.Value, compressionLevel.Value, quoteChar.Value, escapeChar.Value, firstRowAsHeader.Value, nullValue.Value);
diff --git a/src/AzureDataFactory.TestingFramework/Generated/Models/DelimitedTextDataset.cs b/src/AzureDataFactory.TestingFramework/Generated/Models/DelimitedTextDataset.cs
index 6f4a3f55..d3803efe 100644
--- a/src/AzureDataFactory.TestingFramework/Generated/Models/DelimitedTextDataset.cs
+++ b/src/AzureDataFactory.TestingFramework/Generated/Models/DelimitedTextDataset.cs
@@ -47,7 +47,7 @@ public DelimitedTextDataset(DataFactoryLinkedServiceReference linkedServiceName)
         /// <param name="escapeChar"> The escape character. Type: string (or Expression with resultType string). </param>
         /// <param name="firstRowAsHeader"> When used as input, treat the first row of data as headers. When used as output,write the headers into the output as the first row of data. The default value is false. Type: boolean (or Expression with resultType boolean). </param>
         /// <param name="nullValue"> The null value string. Type: string (or Expression with resultType string). </param>
-        internal DelimitedTextDataset(string datasetType, string description, DataFactoryElement<IList<DatasetDataElement>> structure, DataFactoryElement<IList<DatasetSchemaDataElement>> schema, DataFactoryLinkedServiceReference linkedServiceName, IDictionary<string, EntityParameterSpecification> parameters, IList<BinaryData> annotations, DatasetFolder folder, IDictionary<string, BinaryData> additionalProperties, DatasetLocation dataLocation, DataFactoryElement<string> columnDelimiter, DataFactoryElement<string> rowDelimiter, DataFactoryElement<string> encodingName, DataFactoryElement<string> compressionCodec, BinaryData compressionLevel, DataFactoryElement<string> quoteChar, DataFactoryElement<string> escapeChar, DataFactoryElement<bool> firstRowAsHeader, DataFactoryElement<string> nullValue) : base(datasetType, description, structure, schema, linkedServiceName, parameters, annotations, folder, additionalProperties)
+        internal DelimitedTextDataset(string datasetType, string description, DataFactoryElement<IList<DatasetDataElement>> structure, DataFactoryElement<IList<DatasetSchemaDataElement>> schema, DataFactoryLinkedServiceReference linkedServiceName, IDictionary<string, EntityParameterSpecification> parameters, IList<BinaryData> annotations, DatasetFolder folder, IDictionary<string, DataFactoryElement<string>> additionalProperties, DatasetLocation dataLocation, DataFactoryElement<string> columnDelimiter, DataFactoryElement<string> rowDelimiter, DataFactoryElement<string> encodingName, DataFactoryElement<string> compressionCodec, BinaryData compressionLevel, DataFactoryElement<string> quoteChar, DataFactoryElement<string> escapeChar, DataFactoryElement<bool> firstRowAsHeader, DataFactoryElement<string> nullValue) : base(datasetType, description, structure, schema, linkedServiceName, parameters, annotations, folder, additionalProperties)
         {
             DataLocation = dataLocation;
             ColumnDelimiter = columnDelimiter;
diff --git a/src/AzureDataFactory.TestingFramework/Generated/Models/DelimitedTextReadSettings.Serialization.cs b/src/AzureDataFactory.TestingFramework/Generated/Models/DelimitedTextReadSettings.Serialization.cs
index ce38cab8..9356d4a8 100644
--- a/src/AzureDataFactory.TestingFramework/Generated/Models/DelimitedTextReadSettings.Serialization.cs
+++ b/src/AzureDataFactory.TestingFramework/Generated/Models/DelimitedTextReadSettings.Serialization.cs
@@ -49,8 +49,8 @@ internal static DelimitedTextReadSettings DeserializeDelimitedTextReadSettings(J
             Optional<DataFactoryElement<int>> skipLineCount = default;
             Optional<CompressionReadSettings> compressionProperties = default;
             string type = default;
-            IDictionary<string, BinaryData> additionalProperties = default;
-            Dictionary<string, BinaryData> additionalPropertiesDictionary = new Dictionary<string, BinaryData>();
+            IDictionary<string, DataFactoryElement<string>> additionalProperties = default;
+            Dictionary<string, DataFactoryElement<string>> additionalPropertiesDictionary = new Dictionary<string, DataFactoryElement<string>>();
             foreach (var property in element.EnumerateObject())
             {
                 if (property.NameEquals("skipLineCount"u8))
@@ -76,7 +76,7 @@ internal static DelimitedTextReadSettings DeserializeDelimitedTextReadSettings(J
                     type = property.Value.GetString();
                     continue;
                 }
-                additionalPropertiesDictionary.Add(property.Name, BinaryData.FromString(property.Value.GetRawText()));
+                additionalPropertiesDictionary.Add(property.Name, JsonSerializer.Deserialize<DataFactoryElement<string>>(property.Value.GetRawText()));
             }
             additionalProperties = additionalPropertiesDictionary;
             return new DelimitedTextReadSettings(type, additionalProperties, skipLineCount.Value, compressionProperties.Value);
diff --git a/src/AzureDataFactory.TestingFramework/Generated/Models/DelimitedTextReadSettings.cs b/src/AzureDataFactory.TestingFramework/Generated/Models/DelimitedTextReadSettings.cs
index 79ed0c77..832348ec 100644
--- a/src/AzureDataFactory.TestingFramework/Generated/Models/DelimitedTextReadSettings.cs
+++ b/src/AzureDataFactory.TestingFramework/Generated/Models/DelimitedTextReadSettings.cs
@@ -27,7 +27,7 @@ public DelimitedTextReadSettings()
         /// Please note <see cref="CompressionReadSettings"/> is the base class. According to the scenario, a derived class of the base class might need to be assigned here, or this property needs to be casted to one of the possible derived classes.
         /// The available derived classes include <see cref="TarGzipReadSettings"/>, <see cref="TarReadSettings"/> and <see cref="ZipDeflateReadSettings"/>.
         /// </param>
-        internal DelimitedTextReadSettings(string formatReadSettingsType, IDictionary<string, BinaryData> additionalProperties, DataFactoryElement<int> skipLineCount, CompressionReadSettings compressionProperties) : base(formatReadSettingsType, additionalProperties)
+        internal DelimitedTextReadSettings(string formatReadSettingsType, IDictionary<string, DataFactoryElement<string>> additionalProperties, DataFactoryElement<int> skipLineCount, CompressionReadSettings compressionProperties) : base(formatReadSettingsType, additionalProperties)
         {
             SkipLineCount = skipLineCount;
             CompressionProperties = compressionProperties;
diff --git a/src/AzureDataFactory.TestingFramework/Generated/Models/DelimitedTextSink.Serialization.cs b/src/AzureDataFactory.TestingFramework/Generated/Models/DelimitedTextSink.Serialization.cs
index fbd387c8..0c4e6d1a 100644
--- a/src/AzureDataFactory.TestingFramework/Generated/Models/DelimitedTextSink.Serialization.cs
+++ b/src/AzureDataFactory.TestingFramework/Generated/Models/DelimitedTextSink.Serialization.cs
@@ -85,8 +85,8 @@ internal static DelimitedTextSink DeserializeDelimitedTextSink(JsonElement eleme
             Optional<DataFactoryElement<string>> sinkRetryWait = default;
             Optional<DataFactoryElement<int>> maxConcurrentConnections = default;
             Optional<DataFactoryElement<bool>> disableMetricsCollection = default;
-            IDictionary<string, BinaryData> additionalProperties = default;
-            Dictionary<string, BinaryData> additionalPropertiesDictionary = new Dictionary<string, BinaryData>();
+            IDictionary<string, DataFactoryElement<string>> additionalProperties = default;
+            Dictionary<string, DataFactoryElement<string>> additionalPropertiesDictionary = new Dictionary<string, DataFactoryElement<string>>();
             foreach (var property in element.EnumerateObject())
             {
                 if (property.NameEquals("storeSettings"u8))
@@ -166,7 +166,7 @@ internal static DelimitedTextSink DeserializeDelimitedTextSink(JsonElement eleme
                     disableMetricsCollection = JsonSerializer.Deserialize<DataFactoryElement<bool>>(property.Value.GetRawText());
                     continue;
                 }
-                additionalPropertiesDictionary.Add(property.Name, BinaryData.FromString(property.Value.GetRawText()));
+                additionalPropertiesDictionary.Add(property.Name, JsonSerializer.Deserialize<DataFactoryElement<string>>(property.Value.GetRawText()));
             }
             additionalProperties = additionalPropertiesDictionary;
             return new DelimitedTextSink(type, writeBatchSize.Value, writeBatchTimeout.Value, sinkRetryCount.Value, sinkRetryWait.Value, maxConcurrentConnections.Value, disableMetricsCollection.Value, additionalProperties, storeSettings.Value, formatSettings.Value);
diff --git a/src/AzureDataFactory.TestingFramework/Generated/Models/DelimitedTextSink.cs b/src/AzureDataFactory.TestingFramework/Generated/Models/DelimitedTextSink.cs
index bb502886..00922090 100644
--- a/src/AzureDataFactory.TestingFramework/Generated/Models/DelimitedTextSink.cs
+++ b/src/AzureDataFactory.TestingFramework/Generated/Models/DelimitedTextSink.cs
@@ -33,7 +33,7 @@ public DelimitedTextSink()
         /// The available derived classes include <see cref="AzureBlobFSWriteSettings"/>, <see cref="AzureBlobStorageWriteSettings"/>, <see cref="AzureDataLakeStoreWriteSettings"/>, <see cref="AzureFileStorageWriteSettings"/>, <see cref="FileServerWriteSettings"/> and <see cref="SftpWriteSettings"/>.
         /// </param>
         /// <param name="formatSettings"> DelimitedText format settings. </param>
-        internal DelimitedTextSink(string copySinkType, DataFactoryElement<int> writeBatchSize, DataFactoryElement<string> writeBatchTimeout, DataFactoryElement<int> sinkRetryCount, DataFactoryElement<string> sinkRetryWait, DataFactoryElement<int> maxConcurrentConnections, DataFactoryElement<bool> disableMetricsCollection, IDictionary<string, BinaryData> additionalProperties, StoreWriteSettings storeSettings, DelimitedTextWriteSettings formatSettings) : base(copySinkType, writeBatchSize, writeBatchTimeout, sinkRetryCount, sinkRetryWait, maxConcurrentConnections, disableMetricsCollection, additionalProperties)
+        internal DelimitedTextSink(string copySinkType, DataFactoryElement<int> writeBatchSize, DataFactoryElement<string> writeBatchTimeout, DataFactoryElement<int> sinkRetryCount, DataFactoryElement<string> sinkRetryWait, DataFactoryElement<int> maxConcurrentConnections, DataFactoryElement<bool> disableMetricsCollection, IDictionary<string, DataFactoryElement<string>> additionalProperties, StoreWriteSettings storeSettings, DelimitedTextWriteSettings formatSettings) : base(copySinkType, writeBatchSize, writeBatchTimeout, sinkRetryCount, sinkRetryWait, maxConcurrentConnections, disableMetricsCollection, additionalProperties)
         {
             StoreSettings = storeSettings;
             FormatSettings = formatSettings;
diff --git a/src/AzureDataFactory.TestingFramework/Generated/Models/DelimitedTextSource.Serialization.cs b/src/AzureDataFactory.TestingFramework/Generated/Models/DelimitedTextSource.Serialization.cs
index 5e80c313..87965249 100644
--- a/src/AzureDataFactory.TestingFramework/Generated/Models/DelimitedTextSource.Serialization.cs
+++ b/src/AzureDataFactory.TestingFramework/Generated/Models/DelimitedTextSource.Serialization.cs
@@ -83,8 +83,8 @@ internal static DelimitedTextSource DeserializeDelimitedTextSource(JsonElement e
             Optional<DataFactoryElement<string>> sourceRetryWait = default;
             Optional<DataFactoryElement<int>> maxConcurrentConnections = default;
             Optional<DataFactoryElement<bool>> disableMetricsCollection = default;
-            IDictionary<string, BinaryData> additionalProperties = default;
-            Dictionary<string, BinaryData> additionalPropertiesDictionary = new Dictionary<string, BinaryData>();
+            IDictionary<string, DataFactoryElement<string>> additionalProperties = default;
+            Dictionary<string, DataFactoryElement<string>> additionalPropertiesDictionary = new Dictionary<string, DataFactoryElement<string>>();
             foreach (var property in element.EnumerateObject())
             {
                 if (property.NameEquals("storeSettings"u8))
@@ -155,7 +155,7 @@ internal static DelimitedTextSource DeserializeDelimitedTextSource(JsonElement e
                     disableMetricsCollection = JsonSerializer.Deserialize<DataFactoryElement<bool>>(property.Value.GetRawText());
                     continue;
                 }
-                additionalPropertiesDictionary.Add(property.Name, BinaryData.FromString(property.Value.GetRawText()));
+                additionalPropertiesDictionary.Add(property.Name, JsonSerializer.Deserialize<DataFactoryElement<string>>(property.Value.GetRawText()));
             }
             additionalProperties = additionalPropertiesDictionary;
             return new DelimitedTextSource(type, sourceRetryCount.Value, sourceRetryWait.Value, maxConcurrentConnections.Value, disableMetricsCollection.Value, additionalProperties, storeSettings.Value, formatSettings.Value, additionalColumns.Value);
diff --git a/src/AzureDataFactory.TestingFramework/Generated/Models/DelimitedTextSource.cs b/src/AzureDataFactory.TestingFramework/Generated/Models/DelimitedTextSource.cs
index ca424ecb..caef9e64 100644
--- a/src/AzureDataFactory.TestingFramework/Generated/Models/DelimitedTextSource.cs
+++ b/src/AzureDataFactory.TestingFramework/Generated/Models/DelimitedTextSource.cs
@@ -32,7 +32,7 @@ public DelimitedTextSource()
         /// </param>
         /// <param name="formatSettings"> DelimitedText format settings. </param>
         /// <param name="additionalColumns"> Specifies the additional columns to be added to source data. Type: array of objects(AdditionalColumns) (or Expression with resultType array of objects). </param>
-        internal DelimitedTextSource(string copySourceType, DataFactoryElement<int> sourceRetryCount, DataFactoryElement<string> sourceRetryWait, DataFactoryElement<int> maxConcurrentConnections, DataFactoryElement<bool> disableMetricsCollection, IDictionary<string, BinaryData> additionalProperties, StoreReadSettings storeSettings, DelimitedTextReadSettings formatSettings, BinaryData additionalColumns) : base(copySourceType, sourceRetryCount, sourceRetryWait, maxConcurrentConnections, disableMetricsCollection, additionalProperties)
+        internal DelimitedTextSource(string copySourceType, DataFactoryElement<int> sourceRetryCount, DataFactoryElement<string> sourceRetryWait, DataFactoryElement<int> maxConcurrentConnections, DataFactoryElement<bool> disableMetricsCollection, IDictionary<string, DataFactoryElement<string>> additionalProperties, StoreReadSettings storeSettings, DelimitedTextReadSettings formatSettings, BinaryData additionalColumns) : base(copySourceType, sourceRetryCount, sourceRetryWait, maxConcurrentConnections, disableMetricsCollection, additionalProperties)
         {
             StoreSettings = storeSettings;
             FormatSettings = formatSettings;
diff --git a/src/AzureDataFactory.TestingFramework/Generated/Models/DelimitedTextWriteSettings.Serialization.cs b/src/AzureDataFactory.TestingFramework/Generated/Models/DelimitedTextWriteSettings.Serialization.cs
index f6551d59..dd0e526c 100644
--- a/src/AzureDataFactory.TestingFramework/Generated/Models/DelimitedTextWriteSettings.Serialization.cs
+++ b/src/AzureDataFactory.TestingFramework/Generated/Models/DelimitedTextWriteSettings.Serialization.cs
@@ -58,8 +58,8 @@ internal static DelimitedTextWriteSettings DeserializeDelimitedTextWriteSettings
             Optional<DataFactoryElement<int>> maxRowsPerFile = default;
             Optional<DataFactoryElement<string>> fileNamePrefix = default;
             string type = default;
-            IDictionary<string, BinaryData> additionalProperties = default;
-            Dictionary<string, BinaryData> additionalPropertiesDictionary = new Dictionary<string, BinaryData>();
+            IDictionary<string, DataFactoryElement<string>> additionalProperties = default;
+            Dictionary<string, DataFactoryElement<string>> additionalPropertiesDictionary = new Dictionary<string, DataFactoryElement<string>>();
             foreach (var property in element.EnumerateObject())
             {
                 if (property.NameEquals("quoteAllText"u8))
@@ -99,7 +99,7 @@ internal static DelimitedTextWriteSettings DeserializeDelimitedTextWriteSettings
                     type = property.Value.GetString();
                     continue;
                 }
-                additionalPropertiesDictionary.Add(property.Name, BinaryData.FromString(property.Value.GetRawText()));
+                additionalPropertiesDictionary.Add(property.Name, JsonSerializer.Deserialize<DataFactoryElement<string>>(property.Value.GetRawText()));
             }
             additionalProperties = additionalPropertiesDictionary;
             return new DelimitedTextWriteSettings(type, additionalProperties, quoteAllText.Value, fileExtension, maxRowsPerFile.Value, fileNamePrefix.Value);
diff --git a/src/AzureDataFactory.TestingFramework/Generated/Models/DelimitedTextWriteSettings.cs b/src/AzureDataFactory.TestingFramework/Generated/Models/DelimitedTextWriteSettings.cs
index 53a0f53a..95e8f30e 100644
--- a/src/AzureDataFactory.TestingFramework/Generated/Models/DelimitedTextWriteSettings.cs
+++ b/src/AzureDataFactory.TestingFramework/Generated/Models/DelimitedTextWriteSettings.cs
@@ -31,7 +31,7 @@ public DelimitedTextWriteSettings(DataFactoryElement<string> fileExtension)
         /// <param name="fileExtension"> The file extension used to create the files. Type: string (or Expression with resultType string). </param>
         /// <param name="maxRowsPerFile"> Limit the written file's row count to be smaller than or equal to the specified count. Type: integer (or Expression with resultType integer). </param>
         /// <param name="fileNamePrefix"> Specifies the file name pattern &lt;fileNamePrefix&gt;_&lt;fileIndex&gt;.&lt;fileExtension&gt; when copy from non-file based store without partitionOptions. Type: string (or Expression with resultType string). </param>
-        internal DelimitedTextWriteSettings(string formatWriteSettingsType, IDictionary<string, BinaryData> additionalProperties, DataFactoryElement<bool> quoteAllText, DataFactoryElement<string> fileExtension, DataFactoryElement<int> maxRowsPerFile, DataFactoryElement<string> fileNamePrefix) : base(formatWriteSettingsType, additionalProperties)
+        internal DelimitedTextWriteSettings(string formatWriteSettingsType, IDictionary<string, DataFactoryElement<string>> additionalProperties, DataFactoryElement<bool> quoteAllText, DataFactoryElement<string> fileExtension, DataFactoryElement<int> maxRowsPerFile, DataFactoryElement<string> fileNamePrefix) : base(formatWriteSettingsType, additionalProperties)
         {
             QuoteAllText = quoteAllText;
             FileExtension = fileExtension;
diff --git a/src/AzureDataFactory.TestingFramework/Generated/Models/DocumentDBCollectionDataset.Serialization.cs b/src/AzureDataFactory.TestingFramework/Generated/Models/DocumentDBCollectionDataset.Serialization.cs
index 950993bb..032fee4a 100644
--- a/src/AzureDataFactory.TestingFramework/Generated/Models/DocumentDBCollectionDataset.Serialization.cs
+++ b/src/AzureDataFactory.TestingFramework/Generated/Models/DocumentDBCollectionDataset.Serialization.cs
@@ -101,8 +101,8 @@ internal static DocumentDBCollectionDataset DeserializeDocumentDBCollectionDatas
             Optional<IList<BinaryData>> annotations = default;
             Optional<DatasetFolder> folder = default;
             DataFactoryElement<string> collectionName = default;
-            IDictionary<string, BinaryData> additionalProperties = default;
-            Dictionary<string, BinaryData> additionalPropertiesDictionary = new Dictionary<string, BinaryData>();
+            IDictionary<string, DataFactoryElement<string>> additionalProperties = default;
+            Dictionary<string, DataFactoryElement<string>> additionalPropertiesDictionary = new Dictionary<string, DataFactoryElement<string>>();
             foreach (var property in element.EnumerateObject())
             {
                 if (property.NameEquals("type"u8))
@@ -199,7 +199,7 @@ internal static DocumentDBCollectionDataset DeserializeDocumentDBCollectionDatas
                     }
                     continue;
                 }
-                additionalPropertiesDictionary.Add(property.Name, BinaryData.FromString(property.Value.GetRawText()));
+                additionalPropertiesDictionary.Add(property.Name, JsonSerializer.Deserialize<DataFactoryElement<string>>(property.Value.GetRawText()));
             }
             additionalProperties = additionalPropertiesDictionary;
             return new DocumentDBCollectionDataset(type, description.Value, structure.Value, schema.Value, linkedServiceName, Optional.ToDictionary(parameters), Optional.ToList(annotations), folder.Value, additionalProperties, collectionName);
diff --git a/src/AzureDataFactory.TestingFramework/Generated/Models/DocumentDBCollectionDataset.cs b/src/AzureDataFactory.TestingFramework/Generated/Models/DocumentDBCollectionDataset.cs
index 9d213bcb..c2ceb55e 100644
--- a/src/AzureDataFactory.TestingFramework/Generated/Models/DocumentDBCollectionDataset.cs
+++ b/src/AzureDataFactory.TestingFramework/Generated/Models/DocumentDBCollectionDataset.cs
@@ -37,7 +37,7 @@ public DocumentDBCollectionDataset(DataFactoryLinkedServiceReference linkedServi
         /// <param name="folder"> The folder that this Dataset is in. If not specified, Dataset will appear at the root level. </param>
         /// <param name="additionalProperties"> Additional Properties. </param>
         /// <param name="collectionName"> Document Database collection name. Type: string (or Expression with resultType string). </param>
-        internal DocumentDBCollectionDataset(string datasetType, string description, DataFactoryElement<IList<DatasetDataElement>> structure, DataFactoryElement<IList<DatasetSchemaDataElement>> schema, DataFactoryLinkedServiceReference linkedServiceName, IDictionary<string, EntityParameterSpecification> parameters, IList<BinaryData> annotations, DatasetFolder folder, IDictionary<string, BinaryData> additionalProperties, DataFactoryElement<string> collectionName) : base(datasetType, description, structure, schema, linkedServiceName, parameters, annotations, folder, additionalProperties)
+        internal DocumentDBCollectionDataset(string datasetType, string description, DataFactoryElement<IList<DatasetDataElement>> structure, DataFactoryElement<IList<DatasetSchemaDataElement>> schema, DataFactoryLinkedServiceReference linkedServiceName, IDictionary<string, EntityParameterSpecification> parameters, IList<BinaryData> annotations, DatasetFolder folder, IDictionary<string, DataFactoryElement<string>> additionalProperties, DataFactoryElement<string> collectionName) : base(datasetType, description, structure, schema, linkedServiceName, parameters, annotations, folder, additionalProperties)
         {
             CollectionName = collectionName;
             DatasetType = datasetType ?? "DocumentDbCollection";
diff --git a/src/AzureDataFactory.TestingFramework/Generated/Models/DocumentDBCollectionSink.Serialization.cs b/src/AzureDataFactory.TestingFramework/Generated/Models/DocumentDBCollectionSink.Serialization.cs
index bd19c724..d76727bf 100644
--- a/src/AzureDataFactory.TestingFramework/Generated/Models/DocumentDBCollectionSink.Serialization.cs
+++ b/src/AzureDataFactory.TestingFramework/Generated/Models/DocumentDBCollectionSink.Serialization.cs
@@ -85,8 +85,8 @@ internal static DocumentDBCollectionSink DeserializeDocumentDBCollectionSink(Jso
             Optional<DataFactoryElement<string>> sinkRetryWait = default;
             Optional<DataFactoryElement<int>> maxConcurrentConnections = default;
             Optional<DataFactoryElement<bool>> disableMetricsCollection = default;
-            IDictionary<string, BinaryData> additionalProperties = default;
-            Dictionary<string, BinaryData> additionalPropertiesDictionary = new Dictionary<string, BinaryData>();
+            IDictionary<string, DataFactoryElement<string>> additionalProperties = default;
+            Dictionary<string, DataFactoryElement<string>> additionalPropertiesDictionary = new Dictionary<string, DataFactoryElement<string>>();
             foreach (var property in element.EnumerateObject())
             {
                 if (property.NameEquals("nestingSeparator"u8))
@@ -166,7 +166,7 @@ internal static DocumentDBCollectionSink DeserializeDocumentDBCollectionSink(Jso
                     disableMetricsCollection = JsonSerializer.Deserialize<DataFactoryElement<bool>>(property.Value.GetRawText());
                     continue;
                 }
-                additionalPropertiesDictionary.Add(property.Name, BinaryData.FromString(property.Value.GetRawText()));
+                additionalPropertiesDictionary.Add(property.Name, JsonSerializer.Deserialize<DataFactoryElement<string>>(property.Value.GetRawText()));
             }
             additionalProperties = additionalPropertiesDictionary;
             return new DocumentDBCollectionSink(type, writeBatchSize.Value, writeBatchTimeout.Value, sinkRetryCount.Value, sinkRetryWait.Value, maxConcurrentConnections.Value, disableMetricsCollection.Value, additionalProperties, nestingSeparator.Value, writeBehavior.Value);
diff --git a/src/AzureDataFactory.TestingFramework/Generated/Models/DocumentDBCollectionSink.cs b/src/AzureDataFactory.TestingFramework/Generated/Models/DocumentDBCollectionSink.cs
index 2b9e8f73..ca783198 100644
--- a/src/AzureDataFactory.TestingFramework/Generated/Models/DocumentDBCollectionSink.cs
+++ b/src/AzureDataFactory.TestingFramework/Generated/Models/DocumentDBCollectionSink.cs
@@ -29,7 +29,7 @@ public DocumentDBCollectionSink()
         /// <param name="additionalProperties"> Additional Properties. </param>
         /// <param name="nestingSeparator"> Nested properties separator. Default is . (dot). Type: string (or Expression with resultType string). </param>
         /// <param name="writeBehavior"> Describes how to write data to Azure Cosmos DB. Type: string (or Expression with resultType string). Allowed values: insert and upsert. </param>
-        internal DocumentDBCollectionSink(string copySinkType, DataFactoryElement<int> writeBatchSize, DataFactoryElement<string> writeBatchTimeout, DataFactoryElement<int> sinkRetryCount, DataFactoryElement<string> sinkRetryWait, DataFactoryElement<int> maxConcurrentConnections, DataFactoryElement<bool> disableMetricsCollection, IDictionary<string, BinaryData> additionalProperties, DataFactoryElement<string> nestingSeparator, DataFactoryElement<string> writeBehavior) : base(copySinkType, writeBatchSize, writeBatchTimeout, sinkRetryCount, sinkRetryWait, maxConcurrentConnections, disableMetricsCollection, additionalProperties)
+        internal DocumentDBCollectionSink(string copySinkType, DataFactoryElement<int> writeBatchSize, DataFactoryElement<string> writeBatchTimeout, DataFactoryElement<int> sinkRetryCount, DataFactoryElement<string> sinkRetryWait, DataFactoryElement<int> maxConcurrentConnections, DataFactoryElement<bool> disableMetricsCollection, IDictionary<string, DataFactoryElement<string>> additionalProperties, DataFactoryElement<string> nestingSeparator, DataFactoryElement<string> writeBehavior) : base(copySinkType, writeBatchSize, writeBatchTimeout, sinkRetryCount, sinkRetryWait, maxConcurrentConnections, disableMetricsCollection, additionalProperties)
         {
             NestingSeparator = nestingSeparator;
             WriteBehavior = writeBehavior;
diff --git a/src/AzureDataFactory.TestingFramework/Generated/Models/DocumentDBCollectionSource.Serialization.cs b/src/AzureDataFactory.TestingFramework/Generated/Models/DocumentDBCollectionSource.Serialization.cs
index 02096519..25f74e8a 100644
--- a/src/AzureDataFactory.TestingFramework/Generated/Models/DocumentDBCollectionSource.Serialization.cs
+++ b/src/AzureDataFactory.TestingFramework/Generated/Models/DocumentDBCollectionSource.Serialization.cs
@@ -89,8 +89,8 @@ internal static DocumentDBCollectionSource DeserializeDocumentDBCollectionSource
             Optional<DataFactoryElement<string>> sourceRetryWait = default;
             Optional<DataFactoryElement<int>> maxConcurrentConnections = default;
             Optional<DataFactoryElement<bool>> disableMetricsCollection = default;
-            IDictionary<string, BinaryData> additionalProperties = default;
-            Dictionary<string, BinaryData> additionalPropertiesDictionary = new Dictionary<string, BinaryData>();
+            IDictionary<string, DataFactoryElement<string>> additionalProperties = default;
+            Dictionary<string, DataFactoryElement<string>> additionalPropertiesDictionary = new Dictionary<string, DataFactoryElement<string>>();
             foreach (var property in element.EnumerateObject())
             {
                 if (property.NameEquals("query"u8))
@@ -170,7 +170,7 @@ internal static DocumentDBCollectionSource DeserializeDocumentDBCollectionSource
                     disableMetricsCollection = JsonSerializer.Deserialize<DataFactoryElement<bool>>(property.Value.GetRawText());
                     continue;
                 }
-                additionalPropertiesDictionary.Add(property.Name, BinaryData.FromString(property.Value.GetRawText()));
+                additionalPropertiesDictionary.Add(property.Name, JsonSerializer.Deserialize<DataFactoryElement<string>>(property.Value.GetRawText()));
             }
             additionalProperties = additionalPropertiesDictionary;
             return new DocumentDBCollectionSource(type, sourceRetryCount.Value, sourceRetryWait.Value, maxConcurrentConnections.Value, disableMetricsCollection.Value, additionalProperties, query.Value, nestingSeparator.Value, queryTimeout.Value, additionalColumns.Value);
diff --git a/src/AzureDataFactory.TestingFramework/Generated/Models/DocumentDBCollectionSource.cs b/src/AzureDataFactory.TestingFramework/Generated/Models/DocumentDBCollectionSource.cs
index f3d01509..4375211a 100644
--- a/src/AzureDataFactory.TestingFramework/Generated/Models/DocumentDBCollectionSource.cs
+++ b/src/AzureDataFactory.TestingFramework/Generated/Models/DocumentDBCollectionSource.cs
@@ -29,7 +29,7 @@ public DocumentDBCollectionSource()
         /// <param name="nestingSeparator"> Nested properties separator. Type: string (or Expression with resultType string). </param>
         /// <param name="queryTimeout"> Query timeout. Type: string (or Expression with resultType string), pattern: ((\d+)\.)?(\d\d):(60|([0-5][0-9])):(60|([0-5][0-9])). </param>
         /// <param name="additionalColumns"> Specifies the additional columns to be added to source data. Type: array of objects(AdditionalColumns) (or Expression with resultType array of objects). </param>
-        internal DocumentDBCollectionSource(string copySourceType, DataFactoryElement<int> sourceRetryCount, DataFactoryElement<string> sourceRetryWait, DataFactoryElement<int> maxConcurrentConnections, DataFactoryElement<bool> disableMetricsCollection, IDictionary<string, BinaryData> additionalProperties, DataFactoryElement<string> query, DataFactoryElement<string> nestingSeparator, DataFactoryElement<string> queryTimeout, BinaryData additionalColumns) : base(copySourceType, sourceRetryCount, sourceRetryWait, maxConcurrentConnections, disableMetricsCollection, additionalProperties)
+        internal DocumentDBCollectionSource(string copySourceType, DataFactoryElement<int> sourceRetryCount, DataFactoryElement<string> sourceRetryWait, DataFactoryElement<int> maxConcurrentConnections, DataFactoryElement<bool> disableMetricsCollection, IDictionary<string, DataFactoryElement<string>> additionalProperties, DataFactoryElement<string> query, DataFactoryElement<string> nestingSeparator, DataFactoryElement<string> queryTimeout, BinaryData additionalColumns) : base(copySourceType, sourceRetryCount, sourceRetryWait, maxConcurrentConnections, disableMetricsCollection, additionalProperties)
         {
             Query = query;
             NestingSeparator = nestingSeparator;
diff --git a/src/AzureDataFactory.TestingFramework/Generated/Models/DrillLinkedService.Serialization.cs b/src/AzureDataFactory.TestingFramework/Generated/Models/DrillLinkedService.Serialization.cs
index 57265e31..1109f48a 100644
--- a/src/AzureDataFactory.TestingFramework/Generated/Models/DrillLinkedService.Serialization.cs
+++ b/src/AzureDataFactory.TestingFramework/Generated/Models/DrillLinkedService.Serialization.cs
@@ -102,8 +102,8 @@ internal static DrillLinkedService DeserializeDrillLinkedService(JsonElement ele
             Optional<DataFactoryElement<string>> connectionString = default;
             Optional<DataFactoryKeyVaultSecretReference> password = default;
             Optional<string> encryptedCredential = default;
-            IDictionary<string, BinaryData> additionalProperties = default;
-            Dictionary<string, BinaryData> additionalPropertiesDictionary = new Dictionary<string, BinaryData>();
+            IDictionary<string, DataFactoryElement<string>> additionalProperties = default;
+            Dictionary<string, DataFactoryElement<string>> additionalPropertiesDictionary = new Dictionary<string, DataFactoryElement<string>>();
             foreach (var property in element.EnumerateObject())
             {
                 if (property.NameEquals("type"u8))
@@ -195,7 +195,7 @@ internal static DrillLinkedService DeserializeDrillLinkedService(JsonElement ele
                     }
                     continue;
                 }
-                additionalPropertiesDictionary.Add(property.Name, BinaryData.FromString(property.Value.GetRawText()));
+                additionalPropertiesDictionary.Add(property.Name, JsonSerializer.Deserialize<DataFactoryElement<string>>(property.Value.GetRawText()));
             }
             additionalProperties = additionalPropertiesDictionary;
             return new DrillLinkedService(type, connectVia.Value, description.Value, Optional.ToDictionary(parameters), Optional.ToList(annotations), additionalProperties, connectionString.Value, password, encryptedCredential.Value);
diff --git a/src/AzureDataFactory.TestingFramework/Generated/Models/DrillLinkedService.cs b/src/AzureDataFactory.TestingFramework/Generated/Models/DrillLinkedService.cs
index 433b1057..ee7c4cc1 100644
--- a/src/AzureDataFactory.TestingFramework/Generated/Models/DrillLinkedService.cs
+++ b/src/AzureDataFactory.TestingFramework/Generated/Models/DrillLinkedService.cs
@@ -28,7 +28,7 @@ public DrillLinkedService()
         /// <param name="connectionString"> An ODBC connection string. Type: string, SecureString or AzureKeyVaultSecretReference. </param>
         /// <param name="password"> The Azure key vault secret reference of password in connection string. </param>
         /// <param name="encryptedCredential"> The encrypted credential used for authentication. Credentials are encrypted using the integration runtime credential manager. Type: string. </param>
-        internal DrillLinkedService(string linkedServiceType, IntegrationRuntimeReference connectVia, string description, IDictionary<string, EntityParameterSpecification> parameters, IList<BinaryData> annotations, IDictionary<string, BinaryData> additionalProperties, DataFactoryElement<string> connectionString, DataFactoryKeyVaultSecretReference password, string encryptedCredential) : base(linkedServiceType, connectVia, description, parameters, annotations, additionalProperties)
+        internal DrillLinkedService(string linkedServiceType, IntegrationRuntimeReference connectVia, string description, IDictionary<string, EntityParameterSpecification> parameters, IList<BinaryData> annotations, IDictionary<string, DataFactoryElement<string>> additionalProperties, DataFactoryElement<string> connectionString, DataFactoryKeyVaultSecretReference password, string encryptedCredential) : base(linkedServiceType, connectVia, description, parameters, annotations, additionalProperties)
         {
             ConnectionString = connectionString;
             Password = password;
diff --git a/src/AzureDataFactory.TestingFramework/Generated/Models/DrillSource.Serialization.cs b/src/AzureDataFactory.TestingFramework/Generated/Models/DrillSource.Serialization.cs
index 30304865..b21c896a 100644
--- a/src/AzureDataFactory.TestingFramework/Generated/Models/DrillSource.Serialization.cs
+++ b/src/AzureDataFactory.TestingFramework/Generated/Models/DrillSource.Serialization.cs
@@ -83,8 +83,8 @@ internal static DrillSource DeserializeDrillSource(JsonElement element)
             Optional<DataFactoryElement<string>> sourceRetryWait = default;
             Optional<DataFactoryElement<int>> maxConcurrentConnections = default;
             Optional<DataFactoryElement<bool>> disableMetricsCollection = default;
-            IDictionary<string, BinaryData> additionalProperties = default;
-            Dictionary<string, BinaryData> additionalPropertiesDictionary = new Dictionary<string, BinaryData>();
+            IDictionary<string, DataFactoryElement<string>> additionalProperties = default;
+            Dictionary<string, DataFactoryElement<string>> additionalPropertiesDictionary = new Dictionary<string, DataFactoryElement<string>>();
             foreach (var property in element.EnumerateObject())
             {
                 if (property.NameEquals("query"u8))
@@ -155,7 +155,7 @@ internal static DrillSource DeserializeDrillSource(JsonElement element)
                     disableMetricsCollection = JsonSerializer.Deserialize<DataFactoryElement<bool>>(property.Value.GetRawText());
                     continue;
                 }
-                additionalPropertiesDictionary.Add(property.Name, BinaryData.FromString(property.Value.GetRawText()));
+                additionalPropertiesDictionary.Add(property.Name, JsonSerializer.Deserialize<DataFactoryElement<string>>(property.Value.GetRawText()));
             }
             additionalProperties = additionalPropertiesDictionary;
             return new DrillSource(type, sourceRetryCount.Value, sourceRetryWait.Value, maxConcurrentConnections.Value, disableMetricsCollection.Value, additionalProperties, queryTimeout.Value, additionalColumns.Value, query.Value);
diff --git a/src/AzureDataFactory.TestingFramework/Generated/Models/DrillSource.cs b/src/AzureDataFactory.TestingFramework/Generated/Models/DrillSource.cs
index 6ab7393b..dc54cbd8 100644
--- a/src/AzureDataFactory.TestingFramework/Generated/Models/DrillSource.cs
+++ b/src/AzureDataFactory.TestingFramework/Generated/Models/DrillSource.cs
@@ -28,7 +28,7 @@ public DrillSource()
         /// <param name="queryTimeout"> Query timeout. Type: string (or Expression with resultType string), pattern: ((\d+)\.)?(\d\d):(60|([0-5][0-9])):(60|([0-5][0-9])). </param>
         /// <param name="additionalColumns"> Specifies the additional columns to be added to source data. Type: array of objects(AdditionalColumns) (or Expression with resultType array of objects). </param>
         /// <param name="query"> A query to retrieve data from source. Type: string (or Expression with resultType string). </param>
-        internal DrillSource(string copySourceType, DataFactoryElement<int> sourceRetryCount, DataFactoryElement<string> sourceRetryWait, DataFactoryElement<int> maxConcurrentConnections, DataFactoryElement<bool> disableMetricsCollection, IDictionary<string, BinaryData> additionalProperties, DataFactoryElement<string> queryTimeout, BinaryData additionalColumns, DataFactoryElement<string> query) : base(copySourceType, sourceRetryCount, sourceRetryWait, maxConcurrentConnections, disableMetricsCollection, additionalProperties, queryTimeout, additionalColumns)
+        internal DrillSource(string copySourceType, DataFactoryElement<int> sourceRetryCount, DataFactoryElement<string> sourceRetryWait, DataFactoryElement<int> maxConcurrentConnections, DataFactoryElement<bool> disableMetricsCollection, IDictionary<string, DataFactoryElement<string>> additionalProperties, DataFactoryElement<string> queryTimeout, BinaryData additionalColumns, DataFactoryElement<string> query) : base(copySourceType, sourceRetryCount, sourceRetryWait, maxConcurrentConnections, disableMetricsCollection, additionalProperties, queryTimeout, additionalColumns)
         {
             Query = query;
             CopySourceType = copySourceType ?? "DrillSource";
diff --git a/src/AzureDataFactory.TestingFramework/Generated/Models/DrillTableDataset.Serialization.cs b/src/AzureDataFactory.TestingFramework/Generated/Models/DrillTableDataset.Serialization.cs
index a6b660b4..b54bcfc8 100644
--- a/src/AzureDataFactory.TestingFramework/Generated/Models/DrillTableDataset.Serialization.cs
+++ b/src/AzureDataFactory.TestingFramework/Generated/Models/DrillTableDataset.Serialization.cs
@@ -120,8 +120,8 @@ internal static DrillTableDataset DeserializeDrillTableDataset(JsonElement eleme
             Optional<BinaryData> tableName = default;
             Optional<DataFactoryElement<string>> table = default;
             Optional<DataFactoryElement<string>> schema0 = default;
-            IDictionary<string, BinaryData> additionalProperties = default;
-            Dictionary<string, BinaryData> additionalPropertiesDictionary = new Dictionary<string, BinaryData>();
+            IDictionary<string, DataFactoryElement<string>> additionalProperties = default;
+            Dictionary<string, DataFactoryElement<string>> additionalPropertiesDictionary = new Dictionary<string, DataFactoryElement<string>>();
             foreach (var property in element.EnumerateObject())
             {
                 if (property.NameEquals("type"u8))
@@ -240,7 +240,7 @@ internal static DrillTableDataset DeserializeDrillTableDataset(JsonElement eleme
                     }
                     continue;
                 }
-                additionalPropertiesDictionary.Add(property.Name, BinaryData.FromString(property.Value.GetRawText()));
+                additionalPropertiesDictionary.Add(property.Name, JsonSerializer.Deserialize<DataFactoryElement<string>>(property.Value.GetRawText()));
             }
             additionalProperties = additionalPropertiesDictionary;
             return new DrillTableDataset(type, description.Value, structure.Value, schema.Value, linkedServiceName, Optional.ToDictionary(parameters), Optional.ToList(annotations), folder.Value, additionalProperties, tableName.Value, table.Value, schema0.Value);
diff --git a/src/AzureDataFactory.TestingFramework/Generated/Models/DrillTableDataset.cs b/src/AzureDataFactory.TestingFramework/Generated/Models/DrillTableDataset.cs
index 809cb5c7..3a77b978 100644
--- a/src/AzureDataFactory.TestingFramework/Generated/Models/DrillTableDataset.cs
+++ b/src/AzureDataFactory.TestingFramework/Generated/Models/DrillTableDataset.cs
@@ -36,7 +36,7 @@ public DrillTableDataset(DataFactoryLinkedServiceReference linkedServiceName) :
         /// <param name="tableName"> This property will be retired. Please consider using schema + table properties instead. </param>
         /// <param name="table"> The table name of the Drill. Type: string (or Expression with resultType string). </param>
         /// <param name="schemaTypePropertiesSchema"> The schema name of the Drill. Type: string (or Expression with resultType string). </param>
-        internal DrillTableDataset(string datasetType, string description, DataFactoryElement<IList<DatasetDataElement>> structure, DataFactoryElement<IList<DatasetSchemaDataElement>> schema, DataFactoryLinkedServiceReference linkedServiceName, IDictionary<string, EntityParameterSpecification> parameters, IList<BinaryData> annotations, DatasetFolder folder, IDictionary<string, BinaryData> additionalProperties, BinaryData tableName, DataFactoryElement<string> table, DataFactoryElement<string> schemaTypePropertiesSchema) : base(datasetType, description, structure, schema, linkedServiceName, parameters, annotations, folder, additionalProperties)
+        internal DrillTableDataset(string datasetType, string description, DataFactoryElement<IList<DatasetDataElement>> structure, DataFactoryElement<IList<DatasetSchemaDataElement>> schema, DataFactoryLinkedServiceReference linkedServiceName, IDictionary<string, EntityParameterSpecification> parameters, IList<BinaryData> annotations, DatasetFolder folder, IDictionary<string, DataFactoryElement<string>> additionalProperties, BinaryData tableName, DataFactoryElement<string> table, DataFactoryElement<string> schemaTypePropertiesSchema) : base(datasetType, description, structure, schema, linkedServiceName, parameters, annotations, folder, additionalProperties)
         {
             TableName = tableName;
             Table = table;
diff --git a/src/AzureDataFactory.TestingFramework/Generated/Models/DynamicsAXLinkedService.Serialization.cs b/src/AzureDataFactory.TestingFramework/Generated/Models/DynamicsAXLinkedService.Serialization.cs
index de87a40c..6a5d0a9e 100644
--- a/src/AzureDataFactory.TestingFramework/Generated/Models/DynamicsAXLinkedService.Serialization.cs
+++ b/src/AzureDataFactory.TestingFramework/Generated/Models/DynamicsAXLinkedService.Serialization.cs
@@ -108,8 +108,8 @@ internal static DynamicsAXLinkedService DeserializeDynamicsAXLinkedService(JsonE
             DataFactoryElement<string> tenant = default;
             DataFactoryElement<string> aadResourceId = default;
             Optional<string> encryptedCredential = default;
-            IDictionary<string, BinaryData> additionalProperties = default;
-            Dictionary<string, BinaryData> additionalPropertiesDictionary = new Dictionary<string, BinaryData>();
+            IDictionary<string, DataFactoryElement<string>> additionalProperties = default;
+            Dictionary<string, DataFactoryElement<string>> additionalPropertiesDictionary = new Dictionary<string, DataFactoryElement<string>>();
             foreach (var property in element.EnumerateObject())
             {
                 if (property.NameEquals("type"u8))
@@ -208,7 +208,7 @@ internal static DynamicsAXLinkedService DeserializeDynamicsAXLinkedService(JsonE
                     }
                     continue;
                 }
-                additionalPropertiesDictionary.Add(property.Name, BinaryData.FromString(property.Value.GetRawText()));
+                additionalPropertiesDictionary.Add(property.Name, JsonSerializer.Deserialize<DataFactoryElement<string>>(property.Value.GetRawText()));
             }
             additionalProperties = additionalPropertiesDictionary;
             return new DynamicsAXLinkedService(type, connectVia.Value, description.Value, Optional.ToDictionary(parameters), Optional.ToList(annotations), additionalProperties, url, servicePrincipalId, servicePrincipalKey, tenant, aadResourceId, encryptedCredential.Value);
diff --git a/src/AzureDataFactory.TestingFramework/Generated/Models/DynamicsAXLinkedService.cs b/src/AzureDataFactory.TestingFramework/Generated/Models/DynamicsAXLinkedService.cs
index 0c02c51f..ee2812b7 100644
--- a/src/AzureDataFactory.TestingFramework/Generated/Models/DynamicsAXLinkedService.cs
+++ b/src/AzureDataFactory.TestingFramework/Generated/Models/DynamicsAXLinkedService.cs
@@ -49,7 +49,7 @@ public DynamicsAXLinkedService(BinaryData uri, DataFactoryElement<string> servic
         /// <param name="tenant"> Specify the tenant information (domain name or tenant ID) under which your application resides. Retrieve it by hovering the mouse in the top-right corner of the Azure portal. Type: string (or Expression with resultType string). </param>
         /// <param name="aadResourceId"> Specify the resource you are requesting authorization. Type: string (or Expression with resultType string). </param>
         /// <param name="encryptedCredential"> The encrypted credential used for authentication. Credentials are encrypted using the integration runtime credential manager. Type: string. </param>
-        internal DynamicsAXLinkedService(string linkedServiceType, IntegrationRuntimeReference connectVia, string description, IDictionary<string, EntityParameterSpecification> parameters, IList<BinaryData> annotations, IDictionary<string, BinaryData> additionalProperties, BinaryData uri, DataFactoryElement<string> servicePrincipalId, DataFactorySecretBaseDefinition servicePrincipalKey, DataFactoryElement<string> tenant, DataFactoryElement<string> aadResourceId, string encryptedCredential) : base(linkedServiceType, connectVia, description, parameters, annotations, additionalProperties)
+        internal DynamicsAXLinkedService(string linkedServiceType, IntegrationRuntimeReference connectVia, string description, IDictionary<string, EntityParameterSpecification> parameters, IList<BinaryData> annotations, IDictionary<string, DataFactoryElement<string>> additionalProperties, BinaryData uri, DataFactoryElement<string> servicePrincipalId, DataFactorySecretBaseDefinition servicePrincipalKey, DataFactoryElement<string> tenant, DataFactoryElement<string> aadResourceId, string encryptedCredential) : base(linkedServiceType, connectVia, description, parameters, annotations, additionalProperties)
         {
             Uri = uri;
             ServicePrincipalId = servicePrincipalId;
diff --git a/src/AzureDataFactory.TestingFramework/Generated/Models/DynamicsAXResourceDataset.Serialization.cs b/src/AzureDataFactory.TestingFramework/Generated/Models/DynamicsAXResourceDataset.Serialization.cs
index 7a77b012..3f3248bd 100644
--- a/src/AzureDataFactory.TestingFramework/Generated/Models/DynamicsAXResourceDataset.Serialization.cs
+++ b/src/AzureDataFactory.TestingFramework/Generated/Models/DynamicsAXResourceDataset.Serialization.cs
@@ -101,8 +101,8 @@ internal static DynamicsAXResourceDataset DeserializeDynamicsAXResourceDataset(J
             Optional<IList<BinaryData>> annotations = default;
             Optional<DatasetFolder> folder = default;
             DataFactoryElement<string> path = default;
-            IDictionary<string, BinaryData> additionalProperties = default;
-            Dictionary<string, BinaryData> additionalPropertiesDictionary = new Dictionary<string, BinaryData>();
+            IDictionary<string, DataFactoryElement<string>> additionalProperties = default;
+            Dictionary<string, DataFactoryElement<string>> additionalPropertiesDictionary = new Dictionary<string, DataFactoryElement<string>>();
             foreach (var property in element.EnumerateObject())
             {
                 if (property.NameEquals("type"u8))
@@ -199,7 +199,7 @@ internal static DynamicsAXResourceDataset DeserializeDynamicsAXResourceDataset(J
                     }
                     continue;
                 }
-                additionalPropertiesDictionary.Add(property.Name, BinaryData.FromString(property.Value.GetRawText()));
+                additionalPropertiesDictionary.Add(property.Name, JsonSerializer.Deserialize<DataFactoryElement<string>>(property.Value.GetRawText()));
             }
             additionalProperties = additionalPropertiesDictionary;
             return new DynamicsAXResourceDataset(type, description.Value, structure.Value, schema.Value, linkedServiceName, Optional.ToDictionary(parameters), Optional.ToList(annotations), folder.Value, additionalProperties, path);
diff --git a/src/AzureDataFactory.TestingFramework/Generated/Models/DynamicsAXResourceDataset.cs b/src/AzureDataFactory.TestingFramework/Generated/Models/DynamicsAXResourceDataset.cs
index d97c60ad..bac63117 100644
--- a/src/AzureDataFactory.TestingFramework/Generated/Models/DynamicsAXResourceDataset.cs
+++ b/src/AzureDataFactory.TestingFramework/Generated/Models/DynamicsAXResourceDataset.cs
@@ -37,7 +37,7 @@ public DynamicsAXResourceDataset(DataFactoryLinkedServiceReference linkedService
         /// <param name="folder"> The folder that this Dataset is in. If not specified, Dataset will appear at the root level. </param>
         /// <param name="additionalProperties"> Additional Properties. </param>
         /// <param name="path"> The path of the Dynamics AX OData entity. Type: string (or Expression with resultType string). </param>
-        internal DynamicsAXResourceDataset(string datasetType, string description, DataFactoryElement<IList<DatasetDataElement>> structure, DataFactoryElement<IList<DatasetSchemaDataElement>> schema, DataFactoryLinkedServiceReference linkedServiceName, IDictionary<string, EntityParameterSpecification> parameters, IList<BinaryData> annotations, DatasetFolder folder, IDictionary<string, BinaryData> additionalProperties, DataFactoryElement<string> path) : base(datasetType, description, structure, schema, linkedServiceName, parameters, annotations, folder, additionalProperties)
+        internal DynamicsAXResourceDataset(string datasetType, string description, DataFactoryElement<IList<DatasetDataElement>> structure, DataFactoryElement<IList<DatasetSchemaDataElement>> schema, DataFactoryLinkedServiceReference linkedServiceName, IDictionary<string, EntityParameterSpecification> parameters, IList<BinaryData> annotations, DatasetFolder folder, IDictionary<string, DataFactoryElement<string>> additionalProperties, DataFactoryElement<string> path) : base(datasetType, description, structure, schema, linkedServiceName, parameters, annotations, folder, additionalProperties)
         {
             Path = path;
             DatasetType = datasetType ?? "DynamicsAXResource";
diff --git a/src/AzureDataFactory.TestingFramework/Generated/Models/DynamicsAXSource.Serialization.cs b/src/AzureDataFactory.TestingFramework/Generated/Models/DynamicsAXSource.Serialization.cs
index 6dbb5ebe..e0225dcb 100644
--- a/src/AzureDataFactory.TestingFramework/Generated/Models/DynamicsAXSource.Serialization.cs
+++ b/src/AzureDataFactory.TestingFramework/Generated/Models/DynamicsAXSource.Serialization.cs
@@ -89,8 +89,8 @@ internal static DynamicsAXSource DeserializeDynamicsAXSource(JsonElement element
             Optional<DataFactoryElement<string>> sourceRetryWait = default;
             Optional<DataFactoryElement<int>> maxConcurrentConnections = default;
             Optional<DataFactoryElement<bool>> disableMetricsCollection = default;
-            IDictionary<string, BinaryData> additionalProperties = default;
-            Dictionary<string, BinaryData> additionalPropertiesDictionary = new Dictionary<string, BinaryData>();
+            IDictionary<string, DataFactoryElement<string>> additionalProperties = default;
+            Dictionary<string, DataFactoryElement<string>> additionalPropertiesDictionary = new Dictionary<string, DataFactoryElement<string>>();
             foreach (var property in element.EnumerateObject())
             {
                 if (property.NameEquals("query"u8))
@@ -170,7 +170,7 @@ internal static DynamicsAXSource DeserializeDynamicsAXSource(JsonElement element
                     disableMetricsCollection = JsonSerializer.Deserialize<DataFactoryElement<bool>>(property.Value.GetRawText());
                     continue;
                 }
-                additionalPropertiesDictionary.Add(property.Name, BinaryData.FromString(property.Value.GetRawText()));
+                additionalPropertiesDictionary.Add(property.Name, JsonSerializer.Deserialize<DataFactoryElement<string>>(property.Value.GetRawText()));
             }
             additionalProperties = additionalPropertiesDictionary;
             return new DynamicsAXSource(type, sourceRetryCount.Value, sourceRetryWait.Value, maxConcurrentConnections.Value, disableMetricsCollection.Value, additionalProperties, queryTimeout.Value, additionalColumns.Value, query.Value, httpRequestTimeout.Value);
diff --git a/src/AzureDataFactory.TestingFramework/Generated/Models/DynamicsAXSource.cs b/src/AzureDataFactory.TestingFramework/Generated/Models/DynamicsAXSource.cs
index 1aa1c9af..5f37dc36 100644
--- a/src/AzureDataFactory.TestingFramework/Generated/Models/DynamicsAXSource.cs
+++ b/src/AzureDataFactory.TestingFramework/Generated/Models/DynamicsAXSource.cs
@@ -29,7 +29,7 @@ public DynamicsAXSource()
         /// <param name="additionalColumns"> Specifies the additional columns to be added to source data. Type: array of objects(AdditionalColumns) (or Expression with resultType array of objects). </param>
         /// <param name="query"> A query to retrieve data from source. Type: string (or Expression with resultType string). </param>
         /// <param name="httpRequestTimeout"> The timeout (TimeSpan) to get an HTTP response. It is the timeout to get a response, not the timeout to read response data. Default value: 00:05:00. Type: string (or Expression with resultType string), pattern: ((\d+)\.)?(\d\d):(60|([0-5][0-9])):(60|([0-5][0-9])). </param>
-        internal DynamicsAXSource(string copySourceType, DataFactoryElement<int> sourceRetryCount, DataFactoryElement<string> sourceRetryWait, DataFactoryElement<int> maxConcurrentConnections, DataFactoryElement<bool> disableMetricsCollection, IDictionary<string, BinaryData> additionalProperties, DataFactoryElement<string> queryTimeout, BinaryData additionalColumns, DataFactoryElement<string> query, DataFactoryElement<string> httpRequestTimeout) : base(copySourceType, sourceRetryCount, sourceRetryWait, maxConcurrentConnections, disableMetricsCollection, additionalProperties, queryTimeout, additionalColumns)
+        internal DynamicsAXSource(string copySourceType, DataFactoryElement<int> sourceRetryCount, DataFactoryElement<string> sourceRetryWait, DataFactoryElement<int> maxConcurrentConnections, DataFactoryElement<bool> disableMetricsCollection, IDictionary<string, DataFactoryElement<string>> additionalProperties, DataFactoryElement<string> queryTimeout, BinaryData additionalColumns, DataFactoryElement<string> query, DataFactoryElement<string> httpRequestTimeout) : base(copySourceType, sourceRetryCount, sourceRetryWait, maxConcurrentConnections, disableMetricsCollection, additionalProperties, queryTimeout, additionalColumns)
         {
             Query = query;
             HttpRequestTimeout = httpRequestTimeout;
diff --git a/src/AzureDataFactory.TestingFramework/Generated/Models/DynamicsCrmEntityDataset.Serialization.cs b/src/AzureDataFactory.TestingFramework/Generated/Models/DynamicsCrmEntityDataset.Serialization.cs
index 9e49c11e..a37e7cc0 100644
--- a/src/AzureDataFactory.TestingFramework/Generated/Models/DynamicsCrmEntityDataset.Serialization.cs
+++ b/src/AzureDataFactory.TestingFramework/Generated/Models/DynamicsCrmEntityDataset.Serialization.cs
@@ -104,8 +104,8 @@ internal static DynamicsCrmEntityDataset DeserializeDynamicsCrmEntityDataset(Jso
             Optional<IList<BinaryData>> annotations = default;
             Optional<DatasetFolder> folder = default;
             Optional<DataFactoryElement<string>> entityName = default;
-            IDictionary<string, BinaryData> additionalProperties = default;
-            Dictionary<string, BinaryData> additionalPropertiesDictionary = new Dictionary<string, BinaryData>();
+            IDictionary<string, DataFactoryElement<string>> additionalProperties = default;
+            Dictionary<string, DataFactoryElement<string>> additionalPropertiesDictionary = new Dictionary<string, DataFactoryElement<string>>();
             foreach (var property in element.EnumerateObject())
             {
                 if (property.NameEquals("type"u8))
@@ -206,7 +206,7 @@ internal static DynamicsCrmEntityDataset DeserializeDynamicsCrmEntityDataset(Jso
                     }
                     continue;
                 }
-                additionalPropertiesDictionary.Add(property.Name, BinaryData.FromString(property.Value.GetRawText()));
+                additionalPropertiesDictionary.Add(property.Name, JsonSerializer.Deserialize<DataFactoryElement<string>>(property.Value.GetRawText()));
             }
             additionalProperties = additionalPropertiesDictionary;
             return new DynamicsCrmEntityDataset(type, description.Value, structure.Value, schema.Value, linkedServiceName, Optional.ToDictionary(parameters), Optional.ToList(annotations), folder.Value, additionalProperties, entityName.Value);
diff --git a/src/AzureDataFactory.TestingFramework/Generated/Models/DynamicsCrmEntityDataset.cs b/src/AzureDataFactory.TestingFramework/Generated/Models/DynamicsCrmEntityDataset.cs
index 6df669b3..92a9b73a 100644
--- a/src/AzureDataFactory.TestingFramework/Generated/Models/DynamicsCrmEntityDataset.cs
+++ b/src/AzureDataFactory.TestingFramework/Generated/Models/DynamicsCrmEntityDataset.cs
@@ -34,7 +34,7 @@ public DynamicsCrmEntityDataset(DataFactoryLinkedServiceReference linkedServiceN
         /// <param name="folder"> The folder that this Dataset is in. If not specified, Dataset will appear at the root level. </param>
         /// <param name="additionalProperties"> Additional Properties. </param>
         /// <param name="entityName"> The logical name of the entity. Type: string (or Expression with resultType string). </param>
-        internal DynamicsCrmEntityDataset(string datasetType, string description, DataFactoryElement<IList<DatasetDataElement>> structure, DataFactoryElement<IList<DatasetSchemaDataElement>> schema, DataFactoryLinkedServiceReference linkedServiceName, IDictionary<string, EntityParameterSpecification> parameters, IList<BinaryData> annotations, DatasetFolder folder, IDictionary<string, BinaryData> additionalProperties, DataFactoryElement<string> entityName) : base(datasetType, description, structure, schema, linkedServiceName, parameters, annotations, folder, additionalProperties)
+        internal DynamicsCrmEntityDataset(string datasetType, string description, DataFactoryElement<IList<DatasetDataElement>> structure, DataFactoryElement<IList<DatasetSchemaDataElement>> schema, DataFactoryLinkedServiceReference linkedServiceName, IDictionary<string, EntityParameterSpecification> parameters, IList<BinaryData> annotations, DatasetFolder folder, IDictionary<string, DataFactoryElement<string>> additionalProperties, DataFactoryElement<string> entityName) : base(datasetType, description, structure, schema, linkedServiceName, parameters, annotations, folder, additionalProperties)
         {
             EntityName = entityName;
             DatasetType = datasetType ?? "DynamicsCrmEntity";
diff --git a/src/AzureDataFactory.TestingFramework/Generated/Models/DynamicsCrmLinkedService.Serialization.cs b/src/AzureDataFactory.TestingFramework/Generated/Models/DynamicsCrmLinkedService.Serialization.cs
index 8f51f3f9..154500de 100644
--- a/src/AzureDataFactory.TestingFramework/Generated/Models/DynamicsCrmLinkedService.Serialization.cs
+++ b/src/AzureDataFactory.TestingFramework/Generated/Models/DynamicsCrmLinkedService.Serialization.cs
@@ -150,8 +150,8 @@ internal static DynamicsCrmLinkedService DeserializeDynamicsCrmLinkedService(Jso
             Optional<DataFactoryElement<string>> servicePrincipalCredentialType = default;
             Optional<DataFactorySecretBaseDefinition> servicePrincipalCredential = default;
             Optional<string> encryptedCredential = default;
-            IDictionary<string, BinaryData> additionalProperties = default;
-            Dictionary<string, BinaryData> additionalPropertiesDictionary = new Dictionary<string, BinaryData>();
+            IDictionary<string, DataFactoryElement<string>> additionalProperties = default;
+            Dictionary<string, DataFactoryElement<string>> additionalPropertiesDictionary = new Dictionary<string, DataFactoryElement<string>>();
             foreach (var property in element.EnumerateObject())
             {
                 if (property.NameEquals("type"u8))
@@ -316,7 +316,7 @@ internal static DynamicsCrmLinkedService DeserializeDynamicsCrmLinkedService(Jso
                     }
                     continue;
                 }
-                additionalPropertiesDictionary.Add(property.Name, BinaryData.FromString(property.Value.GetRawText()));
+                additionalPropertiesDictionary.Add(property.Name, JsonSerializer.Deserialize<DataFactoryElement<string>>(property.Value.GetRawText()));
             }
             additionalProperties = additionalPropertiesDictionary;
             return new DynamicsCrmLinkedService(type, connectVia.Value, description.Value, Optional.ToDictionary(parameters), Optional.ToList(annotations), additionalProperties, deploymentType, hostName.Value, port.Value, serviceUri.Value, organizationName.Value, authenticationType, username.Value, password, servicePrincipalId.Value, servicePrincipalCredentialType.Value, servicePrincipalCredential, encryptedCredential.Value);
diff --git a/src/AzureDataFactory.TestingFramework/Generated/Models/DynamicsCrmLinkedService.cs b/src/AzureDataFactory.TestingFramework/Generated/Models/DynamicsCrmLinkedService.cs
index d150743b..f0453ebe 100644
--- a/src/AzureDataFactory.TestingFramework/Generated/Models/DynamicsCrmLinkedService.cs
+++ b/src/AzureDataFactory.TestingFramework/Generated/Models/DynamicsCrmLinkedService.cs
@@ -46,7 +46,7 @@ public DynamicsCrmLinkedService(DataFactoryElement<string> deploymentType, DataF
         /// <param name="servicePrincipalCredentialType"> The service principal credential type to use in Server-To-Server authentication. 'ServicePrincipalKey' for key/secret, 'ServicePrincipalCert' for certificate. Type: string (or Expression with resultType string). </param>
         /// <param name="servicePrincipalCredential"> The credential of the service principal object in Azure Active Directory. If servicePrincipalCredentialType is 'ServicePrincipalKey', servicePrincipalCredential can be SecureString or AzureKeyVaultSecretReference. If servicePrincipalCredentialType is 'ServicePrincipalCert', servicePrincipalCredential can only be AzureKeyVaultSecretReference. </param>
         /// <param name="encryptedCredential"> The encrypted credential used for authentication. Credentials are encrypted using the integration runtime credential manager. Type: string. </param>
-        internal DynamicsCrmLinkedService(string linkedServiceType, IntegrationRuntimeReference connectVia, string description, IDictionary<string, EntityParameterSpecification> parameters, IList<BinaryData> annotations, IDictionary<string, BinaryData> additionalProperties, DataFactoryElement<string> deploymentType, DataFactoryElement<string> hostName, DataFactoryElement<int> port, DataFactoryElement<string> serviceUri, DataFactoryElement<string> organizationName, DataFactoryElement<string> authenticationType, DataFactoryElement<string> username, DataFactorySecretBaseDefinition password, DataFactoryElement<string> servicePrincipalId, DataFactoryElement<string> servicePrincipalCredentialType, DataFactorySecretBaseDefinition servicePrincipalCredential, string encryptedCredential) : base(linkedServiceType, connectVia, description, parameters, annotations, additionalProperties)
+        internal DynamicsCrmLinkedService(string linkedServiceType, IntegrationRuntimeReference connectVia, string description, IDictionary<string, EntityParameterSpecification> parameters, IList<BinaryData> annotations, IDictionary<string, DataFactoryElement<string>> additionalProperties, DataFactoryElement<string> deploymentType, DataFactoryElement<string> hostName, DataFactoryElement<int> port, DataFactoryElement<string> serviceUri, DataFactoryElement<string> organizationName, DataFactoryElement<string> authenticationType, DataFactoryElement<string> username, DataFactorySecretBaseDefinition password, DataFactoryElement<string> servicePrincipalId, DataFactoryElement<string> servicePrincipalCredentialType, DataFactorySecretBaseDefinition servicePrincipalCredential, string encryptedCredential) : base(linkedServiceType, connectVia, description, parameters, annotations, additionalProperties)
         {
             DeploymentType = deploymentType;
             HostName = hostName;
diff --git a/src/AzureDataFactory.TestingFramework/Generated/Models/DynamicsCrmSink.Serialization.cs b/src/AzureDataFactory.TestingFramework/Generated/Models/DynamicsCrmSink.Serialization.cs
index 179742a5..b2c980f5 100644
--- a/src/AzureDataFactory.TestingFramework/Generated/Models/DynamicsCrmSink.Serialization.cs
+++ b/src/AzureDataFactory.TestingFramework/Generated/Models/DynamicsCrmSink.Serialization.cs
@@ -88,8 +88,8 @@ internal static DynamicsCrmSink DeserializeDynamicsCrmSink(JsonElement element)
             Optional<DataFactoryElement<string>> sinkRetryWait = default;
             Optional<DataFactoryElement<int>> maxConcurrentConnections = default;
             Optional<DataFactoryElement<bool>> disableMetricsCollection = default;
-            IDictionary<string, BinaryData> additionalProperties = default;
-            Dictionary<string, BinaryData> additionalPropertiesDictionary = new Dictionary<string, BinaryData>();
+            IDictionary<string, DataFactoryElement<string>> additionalProperties = default;
+            Dictionary<string, DataFactoryElement<string>> additionalPropertiesDictionary = new Dictionary<string, DataFactoryElement<string>>();
             foreach (var property in element.EnumerateObject())
             {
                 if (property.NameEquals("writeBehavior"u8))
@@ -174,7 +174,7 @@ internal static DynamicsCrmSink DeserializeDynamicsCrmSink(JsonElement element)
                     disableMetricsCollection = JsonSerializer.Deserialize<DataFactoryElement<bool>>(property.Value.GetRawText());
                     continue;
                 }
-                additionalPropertiesDictionary.Add(property.Name, BinaryData.FromString(property.Value.GetRawText()));
+                additionalPropertiesDictionary.Add(property.Name, JsonSerializer.Deserialize<DataFactoryElement<string>>(property.Value.GetRawText()));
             }
             additionalProperties = additionalPropertiesDictionary;
             return new DynamicsCrmSink(type, writeBatchSize.Value, writeBatchTimeout.Value, sinkRetryCount.Value, sinkRetryWait.Value, maxConcurrentConnections.Value, disableMetricsCollection.Value, additionalProperties, writeBehavior, ignoreNullValues.Value, alternateKeyName.Value);
diff --git a/src/AzureDataFactory.TestingFramework/Generated/Models/DynamicsCrmSink.cs b/src/AzureDataFactory.TestingFramework/Generated/Models/DynamicsCrmSink.cs
index f4df6a1d..5a76ae31 100644
--- a/src/AzureDataFactory.TestingFramework/Generated/Models/DynamicsCrmSink.cs
+++ b/src/AzureDataFactory.TestingFramework/Generated/Models/DynamicsCrmSink.cs
@@ -32,7 +32,7 @@ public DynamicsCrmSink(DynamicsSinkWriteBehavior writeBehavior)
         /// <param name="writeBehavior"> The write behavior for the operation. </param>
         /// <param name="ignoreNullValues"> The flag indicating whether to ignore null values from input dataset (except key fields) during write operation. Default is false. Type: boolean (or Expression with resultType boolean). </param>
         /// <param name="alternateKeyName"> The logical name of the alternate key which will be used when upserting records. Type: string (or Expression with resultType string). </param>
-        internal DynamicsCrmSink(string copySinkType, DataFactoryElement<int> writeBatchSize, DataFactoryElement<string> writeBatchTimeout, DataFactoryElement<int> sinkRetryCount, DataFactoryElement<string> sinkRetryWait, DataFactoryElement<int> maxConcurrentConnections, DataFactoryElement<bool> disableMetricsCollection, IDictionary<string, BinaryData> additionalProperties, DynamicsSinkWriteBehavior writeBehavior, DataFactoryElement<bool> ignoreNullValues, DataFactoryElement<string> alternateKeyName) : base(copySinkType, writeBatchSize, writeBatchTimeout, sinkRetryCount, sinkRetryWait, maxConcurrentConnections, disableMetricsCollection, additionalProperties)
+        internal DynamicsCrmSink(string copySinkType, DataFactoryElement<int> writeBatchSize, DataFactoryElement<string> writeBatchTimeout, DataFactoryElement<int> sinkRetryCount, DataFactoryElement<string> sinkRetryWait, DataFactoryElement<int> maxConcurrentConnections, DataFactoryElement<bool> disableMetricsCollection, IDictionary<string, DataFactoryElement<string>> additionalProperties, DynamicsSinkWriteBehavior writeBehavior, DataFactoryElement<bool> ignoreNullValues, DataFactoryElement<string> alternateKeyName) : base(copySinkType, writeBatchSize, writeBatchTimeout, sinkRetryCount, sinkRetryWait, maxConcurrentConnections, disableMetricsCollection, additionalProperties)
         {
             WriteBehavior = writeBehavior;
             IgnoreNullValues = ignoreNullValues;
diff --git a/src/AzureDataFactory.TestingFramework/Generated/Models/DynamicsCrmSource.Serialization.cs b/src/AzureDataFactory.TestingFramework/Generated/Models/DynamicsCrmSource.Serialization.cs
index f670d3a1..c7f20d6b 100644
--- a/src/AzureDataFactory.TestingFramework/Generated/Models/DynamicsCrmSource.Serialization.cs
+++ b/src/AzureDataFactory.TestingFramework/Generated/Models/DynamicsCrmSource.Serialization.cs
@@ -77,8 +77,8 @@ internal static DynamicsCrmSource DeserializeDynamicsCrmSource(JsonElement eleme
             Optional<DataFactoryElement<string>> sourceRetryWait = default;
             Optional<DataFactoryElement<int>> maxConcurrentConnections = default;
             Optional<DataFactoryElement<bool>> disableMetricsCollection = default;
-            IDictionary<string, BinaryData> additionalProperties = default;
-            Dictionary<string, BinaryData> additionalPropertiesDictionary = new Dictionary<string, BinaryData>();
+            IDictionary<string, DataFactoryElement<string>> additionalProperties = default;
+            Dictionary<string, DataFactoryElement<string>> additionalPropertiesDictionary = new Dictionary<string, DataFactoryElement<string>>();
             foreach (var property in element.EnumerateObject())
             {
                 if (property.NameEquals("query"u8))
@@ -140,7 +140,7 @@ internal static DynamicsCrmSource DeserializeDynamicsCrmSource(JsonElement eleme
                     disableMetricsCollection = JsonSerializer.Deserialize<DataFactoryElement<bool>>(property.Value.GetRawText());
                     continue;
                 }
-                additionalPropertiesDictionary.Add(property.Name, BinaryData.FromString(property.Value.GetRawText()));
+                additionalPropertiesDictionary.Add(property.Name, JsonSerializer.Deserialize<DataFactoryElement<string>>(property.Value.GetRawText()));
             }
             additionalProperties = additionalPropertiesDictionary;
             return new DynamicsCrmSource(type, sourceRetryCount.Value, sourceRetryWait.Value, maxConcurrentConnections.Value, disableMetricsCollection.Value, additionalProperties, query.Value, additionalColumns.Value);
diff --git a/src/AzureDataFactory.TestingFramework/Generated/Models/DynamicsCrmSource.cs b/src/AzureDataFactory.TestingFramework/Generated/Models/DynamicsCrmSource.cs
index 51a982b8..d5e75c28 100644
--- a/src/AzureDataFactory.TestingFramework/Generated/Models/DynamicsCrmSource.cs
+++ b/src/AzureDataFactory.TestingFramework/Generated/Models/DynamicsCrmSource.cs
@@ -27,7 +27,7 @@ public DynamicsCrmSource()
         /// <param name="additionalProperties"> Additional Properties. </param>
         /// <param name="query"> FetchXML is a proprietary query language that is used in Microsoft Dynamics CRM (online &amp; on-premises). Type: string (or Expression with resultType string). </param>
         /// <param name="additionalColumns"> Specifies the additional columns to be added to source data. Type: array of objects(AdditionalColumns) (or Expression with resultType array of objects). </param>
-        internal DynamicsCrmSource(string copySourceType, DataFactoryElement<int> sourceRetryCount, DataFactoryElement<string> sourceRetryWait, DataFactoryElement<int> maxConcurrentConnections, DataFactoryElement<bool> disableMetricsCollection, IDictionary<string, BinaryData> additionalProperties, DataFactoryElement<string> query, BinaryData additionalColumns) : base(copySourceType, sourceRetryCount, sourceRetryWait, maxConcurrentConnections, disableMetricsCollection, additionalProperties)
+        internal DynamicsCrmSource(string copySourceType, DataFactoryElement<int> sourceRetryCount, DataFactoryElement<string> sourceRetryWait, DataFactoryElement<int> maxConcurrentConnections, DataFactoryElement<bool> disableMetricsCollection, IDictionary<string, DataFactoryElement<string>> additionalProperties, DataFactoryElement<string> query, BinaryData additionalColumns) : base(copySourceType, sourceRetryCount, sourceRetryWait, maxConcurrentConnections, disableMetricsCollection, additionalProperties)
         {
             Query = query;
             AdditionalColumns = additionalColumns;
diff --git a/src/AzureDataFactory.TestingFramework/Generated/Models/DynamicsEntityDataset.Serialization.cs b/src/AzureDataFactory.TestingFramework/Generated/Models/DynamicsEntityDataset.Serialization.cs
index bb54f029..e7d00925 100644
--- a/src/AzureDataFactory.TestingFramework/Generated/Models/DynamicsEntityDataset.Serialization.cs
+++ b/src/AzureDataFactory.TestingFramework/Generated/Models/DynamicsEntityDataset.Serialization.cs
@@ -104,8 +104,8 @@ internal static DynamicsEntityDataset DeserializeDynamicsEntityDataset(JsonEleme
             Optional<IList<BinaryData>> annotations = default;
             Optional<DatasetFolder> folder = default;
             Optional<DataFactoryElement<string>> entityName = default;
-            IDictionary<string, BinaryData> additionalProperties = default;
-            Dictionary<string, BinaryData> additionalPropertiesDictionary = new Dictionary<string, BinaryData>();
+            IDictionary<string, DataFactoryElement<string>> additionalProperties = default;
+            Dictionary<string, DataFactoryElement<string>> additionalPropertiesDictionary = new Dictionary<string, DataFactoryElement<string>>();
             foreach (var property in element.EnumerateObject())
             {
                 if (property.NameEquals("type"u8))
@@ -206,7 +206,7 @@ internal static DynamicsEntityDataset DeserializeDynamicsEntityDataset(JsonEleme
                     }
                     continue;
                 }
-                additionalPropertiesDictionary.Add(property.Name, BinaryData.FromString(property.Value.GetRawText()));
+                additionalPropertiesDictionary.Add(property.Name, JsonSerializer.Deserialize<DataFactoryElement<string>>(property.Value.GetRawText()));
             }
             additionalProperties = additionalPropertiesDictionary;
             return new DynamicsEntityDataset(type, description.Value, structure.Value, schema.Value, linkedServiceName, Optional.ToDictionary(parameters), Optional.ToList(annotations), folder.Value, additionalProperties, entityName.Value);
diff --git a/src/AzureDataFactory.TestingFramework/Generated/Models/DynamicsEntityDataset.cs b/src/AzureDataFactory.TestingFramework/Generated/Models/DynamicsEntityDataset.cs
index cff0ae95..a48e0ebe 100644
--- a/src/AzureDataFactory.TestingFramework/Generated/Models/DynamicsEntityDataset.cs
+++ b/src/AzureDataFactory.TestingFramework/Generated/Models/DynamicsEntityDataset.cs
@@ -34,7 +34,7 @@ public DynamicsEntityDataset(DataFactoryLinkedServiceReference linkedServiceName
         /// <param name="folder"> The folder that this Dataset is in. If not specified, Dataset will appear at the root level. </param>
         /// <param name="additionalProperties"> Additional Properties. </param>
         /// <param name="entityName"> The logical name of the entity. Type: string (or Expression with resultType string). </param>
-        internal DynamicsEntityDataset(string datasetType, string description, DataFactoryElement<IList<DatasetDataElement>> structure, DataFactoryElement<IList<DatasetSchemaDataElement>> schema, DataFactoryLinkedServiceReference linkedServiceName, IDictionary<string, EntityParameterSpecification> parameters, IList<BinaryData> annotations, DatasetFolder folder, IDictionary<string, BinaryData> additionalProperties, DataFactoryElement<string> entityName) : base(datasetType, description, structure, schema, linkedServiceName, parameters, annotations, folder, additionalProperties)
+        internal DynamicsEntityDataset(string datasetType, string description, DataFactoryElement<IList<DatasetDataElement>> structure, DataFactoryElement<IList<DatasetSchemaDataElement>> schema, DataFactoryLinkedServiceReference linkedServiceName, IDictionary<string, EntityParameterSpecification> parameters, IList<BinaryData> annotations, DatasetFolder folder, IDictionary<string, DataFactoryElement<string>> additionalProperties, DataFactoryElement<string> entityName) : base(datasetType, description, structure, schema, linkedServiceName, parameters, annotations, folder, additionalProperties)
         {
             EntityName = entityName;
             DatasetType = datasetType ?? "DynamicsEntity";
diff --git a/src/AzureDataFactory.TestingFramework/Generated/Models/DynamicsLinkedService.Serialization.cs b/src/AzureDataFactory.TestingFramework/Generated/Models/DynamicsLinkedService.Serialization.cs
index 72c7a7bb..e1b2cea9 100644
--- a/src/AzureDataFactory.TestingFramework/Generated/Models/DynamicsLinkedService.Serialization.cs
+++ b/src/AzureDataFactory.TestingFramework/Generated/Models/DynamicsLinkedService.Serialization.cs
@@ -156,8 +156,8 @@ internal static DynamicsLinkedService DeserializeDynamicsLinkedService(JsonEleme
             Optional<DataFactorySecretBaseDefinition> servicePrincipalCredential = default;
             Optional<string> encryptedCredential = default;
             Optional<DataFactoryCredentialReference> credential = default;
-            IDictionary<string, BinaryData> additionalProperties = default;
-            Dictionary<string, BinaryData> additionalPropertiesDictionary = new Dictionary<string, BinaryData>();
+            IDictionary<string, DataFactoryElement<string>> additionalProperties = default;
+            Dictionary<string, DataFactoryElement<string>> additionalPropertiesDictionary = new Dictionary<string, DataFactoryElement<string>>();
             foreach (var property in element.EnumerateObject())
             {
                 if (property.NameEquals("type"u8))
@@ -331,7 +331,7 @@ internal static DynamicsLinkedService DeserializeDynamicsLinkedService(JsonEleme
                     }
                     continue;
                 }
-                additionalPropertiesDictionary.Add(property.Name, BinaryData.FromString(property.Value.GetRawText()));
+                additionalPropertiesDictionary.Add(property.Name, JsonSerializer.Deserialize<DataFactoryElement<string>>(property.Value.GetRawText()));
             }
             additionalProperties = additionalPropertiesDictionary;
             return new DynamicsLinkedService(type, connectVia.Value, description.Value, Optional.ToDictionary(parameters), Optional.ToList(annotations), additionalProperties, deploymentType, hostName.Value, port.Value, serviceUri.Value, organizationName.Value, authenticationType, username.Value, password, servicePrincipalId.Value, servicePrincipalCredentialType.Value, servicePrincipalCredential, encryptedCredential.Value, credential.Value);
diff --git a/src/AzureDataFactory.TestingFramework/Generated/Models/DynamicsLinkedService.cs b/src/AzureDataFactory.TestingFramework/Generated/Models/DynamicsLinkedService.cs
index 5b7b14fa..2217adcc 100644
--- a/src/AzureDataFactory.TestingFramework/Generated/Models/DynamicsLinkedService.cs
+++ b/src/AzureDataFactory.TestingFramework/Generated/Models/DynamicsLinkedService.cs
@@ -47,7 +47,7 @@ public DynamicsLinkedService(DataFactoryElement<string> deploymentType, DataFact
         /// <param name="servicePrincipalCredential"> The credential of the service principal object in Azure Active Directory. If servicePrincipalCredentialType is 'ServicePrincipalKey', servicePrincipalCredential can be SecureString or AzureKeyVaultSecretReference. If servicePrincipalCredentialType is 'ServicePrincipalCert', servicePrincipalCredential can only be AzureKeyVaultSecretReference. </param>
         /// <param name="encryptedCredential"> The encrypted credential used for authentication. Credentials are encrypted using the integration runtime credential manager. Type: string. </param>
         /// <param name="credential"> The credential reference containing authentication information. </param>
-        internal DynamicsLinkedService(string linkedServiceType, IntegrationRuntimeReference connectVia, string description, IDictionary<string, EntityParameterSpecification> parameters, IList<BinaryData> annotations, IDictionary<string, BinaryData> additionalProperties, DataFactoryElement<string> deploymentType, DataFactoryElement<string> hostName, DataFactoryElement<int> port, DataFactoryElement<string> serviceUri, DataFactoryElement<string> organizationName, DataFactoryElement<string> authenticationType, DataFactoryElement<string> username, DataFactorySecretBaseDefinition password, DataFactoryElement<string> servicePrincipalId, DataFactoryElement<string> servicePrincipalCredentialType, DataFactorySecretBaseDefinition servicePrincipalCredential, string encryptedCredential, DataFactoryCredentialReference credential) : base(linkedServiceType, connectVia, description, parameters, annotations, additionalProperties)
+        internal DynamicsLinkedService(string linkedServiceType, IntegrationRuntimeReference connectVia, string description, IDictionary<string, EntityParameterSpecification> parameters, IList<BinaryData> annotations, IDictionary<string, DataFactoryElement<string>> additionalProperties, DataFactoryElement<string> deploymentType, DataFactoryElement<string> hostName, DataFactoryElement<int> port, DataFactoryElement<string> serviceUri, DataFactoryElement<string> organizationName, DataFactoryElement<string> authenticationType, DataFactoryElement<string> username, DataFactorySecretBaseDefinition password, DataFactoryElement<string> servicePrincipalId, DataFactoryElement<string> servicePrincipalCredentialType, DataFactorySecretBaseDefinition servicePrincipalCredential, string encryptedCredential, DataFactoryCredentialReference credential) : base(linkedServiceType, connectVia, description, parameters, annotations, additionalProperties)
         {
             DeploymentType = deploymentType;
             HostName = hostName;
diff --git a/src/AzureDataFactory.TestingFramework/Generated/Models/DynamicsSink.Serialization.cs b/src/AzureDataFactory.TestingFramework/Generated/Models/DynamicsSink.Serialization.cs
index 79720f37..2409dab4 100644
--- a/src/AzureDataFactory.TestingFramework/Generated/Models/DynamicsSink.Serialization.cs
+++ b/src/AzureDataFactory.TestingFramework/Generated/Models/DynamicsSink.Serialization.cs
@@ -88,8 +88,8 @@ internal static DynamicsSink DeserializeDynamicsSink(JsonElement element)
             Optional<DataFactoryElement<string>> sinkRetryWait = default;
             Optional<DataFactoryElement<int>> maxConcurrentConnections = default;
             Optional<DataFactoryElement<bool>> disableMetricsCollection = default;
-            IDictionary<string, BinaryData> additionalProperties = default;
-            Dictionary<string, BinaryData> additionalPropertiesDictionary = new Dictionary<string, BinaryData>();
+            IDictionary<string, DataFactoryElement<string>> additionalProperties = default;
+            Dictionary<string, DataFactoryElement<string>> additionalPropertiesDictionary = new Dictionary<string, DataFactoryElement<string>>();
             foreach (var property in element.EnumerateObject())
             {
                 if (property.NameEquals("writeBehavior"u8))
@@ -174,7 +174,7 @@ internal static DynamicsSink DeserializeDynamicsSink(JsonElement element)
                     disableMetricsCollection = JsonSerializer.Deserialize<DataFactoryElement<bool>>(property.Value.GetRawText());
                     continue;
                 }
-                additionalPropertiesDictionary.Add(property.Name, BinaryData.FromString(property.Value.GetRawText()));
+                additionalPropertiesDictionary.Add(property.Name, JsonSerializer.Deserialize<DataFactoryElement<string>>(property.Value.GetRawText()));
             }
             additionalProperties = additionalPropertiesDictionary;
             return new DynamicsSink(type, writeBatchSize.Value, writeBatchTimeout.Value, sinkRetryCount.Value, sinkRetryWait.Value, maxConcurrentConnections.Value, disableMetricsCollection.Value, additionalProperties, writeBehavior, ignoreNullValues.Value, alternateKeyName.Value);
diff --git a/src/AzureDataFactory.TestingFramework/Generated/Models/DynamicsSink.cs b/src/AzureDataFactory.TestingFramework/Generated/Models/DynamicsSink.cs
index 22c724be..0eadbb3e 100644
--- a/src/AzureDataFactory.TestingFramework/Generated/Models/DynamicsSink.cs
+++ b/src/AzureDataFactory.TestingFramework/Generated/Models/DynamicsSink.cs
@@ -32,7 +32,7 @@ public DynamicsSink(DynamicsSinkWriteBehavior writeBehavior)
         /// <param name="writeBehavior"> The write behavior for the operation. </param>
         /// <param name="ignoreNullValues"> The flag indicating whether ignore null values from input dataset (except key fields) during write operation. Default is false. Type: boolean (or Expression with resultType boolean). </param>
         /// <param name="alternateKeyName"> The logical name of the alternate key which will be used when upserting records. Type: string (or Expression with resultType string). </param>
-        internal DynamicsSink(string copySinkType, DataFactoryElement<int> writeBatchSize, DataFactoryElement<string> writeBatchTimeout, DataFactoryElement<int> sinkRetryCount, DataFactoryElement<string> sinkRetryWait, DataFactoryElement<int> maxConcurrentConnections, DataFactoryElement<bool> disableMetricsCollection, IDictionary<string, BinaryData> additionalProperties, DynamicsSinkWriteBehavior writeBehavior, DataFactoryElement<bool> ignoreNullValues, DataFactoryElement<string> alternateKeyName) : base(copySinkType, writeBatchSize, writeBatchTimeout, sinkRetryCount, sinkRetryWait, maxConcurrentConnections, disableMetricsCollection, additionalProperties)
+        internal DynamicsSink(string copySinkType, DataFactoryElement<int> writeBatchSize, DataFactoryElement<string> writeBatchTimeout, DataFactoryElement<int> sinkRetryCount, DataFactoryElement<string> sinkRetryWait, DataFactoryElement<int> maxConcurrentConnections, DataFactoryElement<bool> disableMetricsCollection, IDictionary<string, DataFactoryElement<string>> additionalProperties, DynamicsSinkWriteBehavior writeBehavior, DataFactoryElement<bool> ignoreNullValues, DataFactoryElement<string> alternateKeyName) : base(copySinkType, writeBatchSize, writeBatchTimeout, sinkRetryCount, sinkRetryWait, maxConcurrentConnections, disableMetricsCollection, additionalProperties)
         {
             WriteBehavior = writeBehavior;
             IgnoreNullValues = ignoreNullValues;
diff --git a/src/AzureDataFactory.TestingFramework/Generated/Models/DynamicsSource.Serialization.cs b/src/AzureDataFactory.TestingFramework/Generated/Models/DynamicsSource.Serialization.cs
index d9083ada..1caae9a9 100644
--- a/src/AzureDataFactory.TestingFramework/Generated/Models/DynamicsSource.Serialization.cs
+++ b/src/AzureDataFactory.TestingFramework/Generated/Models/DynamicsSource.Serialization.cs
@@ -77,8 +77,8 @@ internal static DynamicsSource DeserializeDynamicsSource(JsonElement element)
             Optional<DataFactoryElement<string>> sourceRetryWait = default;
             Optional<DataFactoryElement<int>> maxConcurrentConnections = default;
             Optional<DataFactoryElement<bool>> disableMetricsCollection = default;
-            IDictionary<string, BinaryData> additionalProperties = default;
-            Dictionary<string, BinaryData> additionalPropertiesDictionary = new Dictionary<string, BinaryData>();
+            IDictionary<string, DataFactoryElement<string>> additionalProperties = default;
+            Dictionary<string, DataFactoryElement<string>> additionalPropertiesDictionary = new Dictionary<string, DataFactoryElement<string>>();
             foreach (var property in element.EnumerateObject())
             {
                 if (property.NameEquals("query"u8))
@@ -140,7 +140,7 @@ internal static DynamicsSource DeserializeDynamicsSource(JsonElement element)
                     disableMetricsCollection = JsonSerializer.Deserialize<DataFactoryElement<bool>>(property.Value.GetRawText());
                     continue;
                 }
-                additionalPropertiesDictionary.Add(property.Name, BinaryData.FromString(property.Value.GetRawText()));
+                additionalPropertiesDictionary.Add(property.Name, JsonSerializer.Deserialize<DataFactoryElement<string>>(property.Value.GetRawText()));
             }
             additionalProperties = additionalPropertiesDictionary;
             return new DynamicsSource(type, sourceRetryCount.Value, sourceRetryWait.Value, maxConcurrentConnections.Value, disableMetricsCollection.Value, additionalProperties, query.Value, additionalColumns.Value);
diff --git a/src/AzureDataFactory.TestingFramework/Generated/Models/DynamicsSource.cs b/src/AzureDataFactory.TestingFramework/Generated/Models/DynamicsSource.cs
index 7c913219..96106a31 100644
--- a/src/AzureDataFactory.TestingFramework/Generated/Models/DynamicsSource.cs
+++ b/src/AzureDataFactory.TestingFramework/Generated/Models/DynamicsSource.cs
@@ -27,7 +27,7 @@ public DynamicsSource()
         /// <param name="additionalProperties"> Additional Properties. </param>
         /// <param name="query"> FetchXML is a proprietary query language that is used in Microsoft Dynamics (online &amp; on-premises). Type: string (or Expression with resultType string). </param>
         /// <param name="additionalColumns"> Specifies the additional columns to be added to source data. Type: array of objects(AdditionalColumns) (or Expression with resultType array of objects). </param>
-        internal DynamicsSource(string copySourceType, DataFactoryElement<int> sourceRetryCount, DataFactoryElement<string> sourceRetryWait, DataFactoryElement<int> maxConcurrentConnections, DataFactoryElement<bool> disableMetricsCollection, IDictionary<string, BinaryData> additionalProperties, DataFactoryElement<string> query, BinaryData additionalColumns) : base(copySourceType, sourceRetryCount, sourceRetryWait, maxConcurrentConnections, disableMetricsCollection, additionalProperties)
+        internal DynamicsSource(string copySourceType, DataFactoryElement<int> sourceRetryCount, DataFactoryElement<string> sourceRetryWait, DataFactoryElement<int> maxConcurrentConnections, DataFactoryElement<bool> disableMetricsCollection, IDictionary<string, DataFactoryElement<string>> additionalProperties, DataFactoryElement<string> query, BinaryData additionalColumns) : base(copySourceType, sourceRetryCount, sourceRetryWait, maxConcurrentConnections, disableMetricsCollection, additionalProperties)
         {
             Query = query;
             AdditionalColumns = additionalColumns;
diff --git a/src/AzureDataFactory.TestingFramework/Generated/Models/EloquaLinkedService.Serialization.cs b/src/AzureDataFactory.TestingFramework/Generated/Models/EloquaLinkedService.Serialization.cs
index 3723d0a9..6e445d7f 100644
--- a/src/AzureDataFactory.TestingFramework/Generated/Models/EloquaLinkedService.Serialization.cs
+++ b/src/AzureDataFactory.TestingFramework/Generated/Models/EloquaLinkedService.Serialization.cs
@@ -120,8 +120,8 @@ internal static EloquaLinkedService DeserializeEloquaLinkedService(JsonElement e
             Optional<DataFactoryElement<bool>> useHostVerification = default;
             Optional<DataFactoryElement<bool>> usePeerVerification = default;
             Optional<string> encryptedCredential = default;
-            IDictionary<string, BinaryData> additionalProperties = default;
-            Dictionary<string, BinaryData> additionalPropertiesDictionary = new Dictionary<string, BinaryData>();
+            IDictionary<string, DataFactoryElement<string>> additionalProperties = default;
+            Dictionary<string, DataFactoryElement<string>> additionalPropertiesDictionary = new Dictionary<string, DataFactoryElement<string>>();
             foreach (var property in element.EnumerateObject())
             {
                 if (property.NameEquals("type"u8))
@@ -241,7 +241,7 @@ internal static EloquaLinkedService DeserializeEloquaLinkedService(JsonElement e
                     }
                     continue;
                 }
-                additionalPropertiesDictionary.Add(property.Name, BinaryData.FromString(property.Value.GetRawText()));
+                additionalPropertiesDictionary.Add(property.Name, JsonSerializer.Deserialize<DataFactoryElement<string>>(property.Value.GetRawText()));
             }
             additionalProperties = additionalPropertiesDictionary;
             return new EloquaLinkedService(type, connectVia.Value, description.Value, Optional.ToDictionary(parameters), Optional.ToList(annotations), additionalProperties, endpoint, username, password, useEncryptedEndpoints.Value, useHostVerification.Value, usePeerVerification.Value, encryptedCredential.Value);
diff --git a/src/AzureDataFactory.TestingFramework/Generated/Models/EloquaLinkedService.cs b/src/AzureDataFactory.TestingFramework/Generated/Models/EloquaLinkedService.cs
index 7ca988d6..11478ed4 100644
--- a/src/AzureDataFactory.TestingFramework/Generated/Models/EloquaLinkedService.cs
+++ b/src/AzureDataFactory.TestingFramework/Generated/Models/EloquaLinkedService.cs
@@ -41,7 +41,7 @@ public EloquaLinkedService(DataFactoryElement<string> endpoint, DataFactoryEleme
         /// <param name="useHostVerification"> Specifies whether to require the host name in the server's certificate to match the host name of the server when connecting over SSL. The default value is true. </param>
         /// <param name="usePeerVerification"> Specifies whether to verify the identity of the server when connecting over SSL. The default value is true. </param>
         /// <param name="encryptedCredential"> The encrypted credential used for authentication. Credentials are encrypted using the integration runtime credential manager. Type: string. </param>
-        internal EloquaLinkedService(string linkedServiceType, IntegrationRuntimeReference connectVia, string description, IDictionary<string, EntityParameterSpecification> parameters, IList<BinaryData> annotations, IDictionary<string, BinaryData> additionalProperties, DataFactoryElement<string> endpoint, DataFactoryElement<string> username, DataFactorySecretBaseDefinition password, DataFactoryElement<bool> useEncryptedEndpoints, DataFactoryElement<bool> useHostVerification, DataFactoryElement<bool> usePeerVerification, string encryptedCredential) : base(linkedServiceType, connectVia, description, parameters, annotations, additionalProperties)
+        internal EloquaLinkedService(string linkedServiceType, IntegrationRuntimeReference connectVia, string description, IDictionary<string, EntityParameterSpecification> parameters, IList<BinaryData> annotations, IDictionary<string, DataFactoryElement<string>> additionalProperties, DataFactoryElement<string> endpoint, DataFactoryElement<string> username, DataFactorySecretBaseDefinition password, DataFactoryElement<bool> useEncryptedEndpoints, DataFactoryElement<bool> useHostVerification, DataFactoryElement<bool> usePeerVerification, string encryptedCredential) : base(linkedServiceType, connectVia, description, parameters, annotations, additionalProperties)
         {
             Endpoint = endpoint;
             Username = username;
diff --git a/src/AzureDataFactory.TestingFramework/Generated/Models/EloquaObjectDataset.Serialization.cs b/src/AzureDataFactory.TestingFramework/Generated/Models/EloquaObjectDataset.Serialization.cs
index 5f3b757e..a7d6b51a 100644
--- a/src/AzureDataFactory.TestingFramework/Generated/Models/EloquaObjectDataset.Serialization.cs
+++ b/src/AzureDataFactory.TestingFramework/Generated/Models/EloquaObjectDataset.Serialization.cs
@@ -104,8 +104,8 @@ internal static EloquaObjectDataset DeserializeEloquaObjectDataset(JsonElement e
             Optional<IList<BinaryData>> annotations = default;
             Optional<DatasetFolder> folder = default;
             Optional<DataFactoryElement<string>> tableName = default;
-            IDictionary<string, BinaryData> additionalProperties = default;
-            Dictionary<string, BinaryData> additionalPropertiesDictionary = new Dictionary<string, BinaryData>();
+            IDictionary<string, DataFactoryElement<string>> additionalProperties = default;
+            Dictionary<string, DataFactoryElement<string>> additionalPropertiesDictionary = new Dictionary<string, DataFactoryElement<string>>();
             foreach (var property in element.EnumerateObject())
             {
                 if (property.NameEquals("type"u8))
@@ -206,7 +206,7 @@ internal static EloquaObjectDataset DeserializeEloquaObjectDataset(JsonElement e
                     }
                     continue;
                 }
-                additionalPropertiesDictionary.Add(property.Name, BinaryData.FromString(property.Value.GetRawText()));
+                additionalPropertiesDictionary.Add(property.Name, JsonSerializer.Deserialize<DataFactoryElement<string>>(property.Value.GetRawText()));
             }
             additionalProperties = additionalPropertiesDictionary;
             return new EloquaObjectDataset(type, description.Value, structure.Value, schema.Value, linkedServiceName, Optional.ToDictionary(parameters), Optional.ToList(annotations), folder.Value, additionalProperties, tableName.Value);
diff --git a/src/AzureDataFactory.TestingFramework/Generated/Models/EloquaObjectDataset.cs b/src/AzureDataFactory.TestingFramework/Generated/Models/EloquaObjectDataset.cs
index 130151c6..f128f543 100644
--- a/src/AzureDataFactory.TestingFramework/Generated/Models/EloquaObjectDataset.cs
+++ b/src/AzureDataFactory.TestingFramework/Generated/Models/EloquaObjectDataset.cs
@@ -34,7 +34,7 @@ public EloquaObjectDataset(DataFactoryLinkedServiceReference linkedServiceName)
         /// <param name="folder"> The folder that this Dataset is in. If not specified, Dataset will appear at the root level. </param>
         /// <param name="additionalProperties"> Additional Properties. </param>
         /// <param name="tableName"> The table name. Type: string (or Expression with resultType string). </param>
-        internal EloquaObjectDataset(string datasetType, string description, DataFactoryElement<IList<DatasetDataElement>> structure, DataFactoryElement<IList<DatasetSchemaDataElement>> schema, DataFactoryLinkedServiceReference linkedServiceName, IDictionary<string, EntityParameterSpecification> parameters, IList<BinaryData> annotations, DatasetFolder folder, IDictionary<string, BinaryData> additionalProperties, DataFactoryElement<string> tableName) : base(datasetType, description, structure, schema, linkedServiceName, parameters, annotations, folder, additionalProperties)
+        internal EloquaObjectDataset(string datasetType, string description, DataFactoryElement<IList<DatasetDataElement>> structure, DataFactoryElement<IList<DatasetSchemaDataElement>> schema, DataFactoryLinkedServiceReference linkedServiceName, IDictionary<string, EntityParameterSpecification> parameters, IList<BinaryData> annotations, DatasetFolder folder, IDictionary<string, DataFactoryElement<string>> additionalProperties, DataFactoryElement<string> tableName) : base(datasetType, description, structure, schema, linkedServiceName, parameters, annotations, folder, additionalProperties)
         {
             TableName = tableName;
             DatasetType = datasetType ?? "EloquaObject";
diff --git a/src/AzureDataFactory.TestingFramework/Generated/Models/EloquaSource.Serialization.cs b/src/AzureDataFactory.TestingFramework/Generated/Models/EloquaSource.Serialization.cs
index 3d0b075b..9e2b87b0 100644
--- a/src/AzureDataFactory.TestingFramework/Generated/Models/EloquaSource.Serialization.cs
+++ b/src/AzureDataFactory.TestingFramework/Generated/Models/EloquaSource.Serialization.cs
@@ -83,8 +83,8 @@ internal static EloquaSource DeserializeEloquaSource(JsonElement element)
             Optional<DataFactoryElement<string>> sourceRetryWait = default;
             Optional<DataFactoryElement<int>> maxConcurrentConnections = default;
             Optional<DataFactoryElement<bool>> disableMetricsCollection = default;
-            IDictionary<string, BinaryData> additionalProperties = default;
-            Dictionary<string, BinaryData> additionalPropertiesDictionary = new Dictionary<string, BinaryData>();
+            IDictionary<string, DataFactoryElement<string>> additionalProperties = default;
+            Dictionary<string, DataFactoryElement<string>> additionalPropertiesDictionary = new Dictionary<string, DataFactoryElement<string>>();
             foreach (var property in element.EnumerateObject())
             {
                 if (property.NameEquals("query"u8))
@@ -155,7 +155,7 @@ internal static EloquaSource DeserializeEloquaSource(JsonElement element)
                     disableMetricsCollection = JsonSerializer.Deserialize<DataFactoryElement<bool>>(property.Value.GetRawText());
                     continue;
                 }
-                additionalPropertiesDictionary.Add(property.Name, BinaryData.FromString(property.Value.GetRawText()));
+                additionalPropertiesDictionary.Add(property.Name, JsonSerializer.Deserialize<DataFactoryElement<string>>(property.Value.GetRawText()));
             }
             additionalProperties = additionalPropertiesDictionary;
             return new EloquaSource(type, sourceRetryCount.Value, sourceRetryWait.Value, maxConcurrentConnections.Value, disableMetricsCollection.Value, additionalProperties, queryTimeout.Value, additionalColumns.Value, query.Value);
diff --git a/src/AzureDataFactory.TestingFramework/Generated/Models/EloquaSource.cs b/src/AzureDataFactory.TestingFramework/Generated/Models/EloquaSource.cs
index 435487bf..c182338f 100644
--- a/src/AzureDataFactory.TestingFramework/Generated/Models/EloquaSource.cs
+++ b/src/AzureDataFactory.TestingFramework/Generated/Models/EloquaSource.cs
@@ -28,7 +28,7 @@ public EloquaSource()
         /// <param name="queryTimeout"> Query timeout. Type: string (or Expression with resultType string), pattern: ((\d+)\.)?(\d\d):(60|([0-5][0-9])):(60|([0-5][0-9])). </param>
         /// <param name="additionalColumns"> Specifies the additional columns to be added to source data. Type: array of objects(AdditionalColumns) (or Expression with resultType array of objects). </param>
         /// <param name="query"> A query to retrieve data from source. Type: string (or Expression with resultType string). </param>
-        internal EloquaSource(string copySourceType, DataFactoryElement<int> sourceRetryCount, DataFactoryElement<string> sourceRetryWait, DataFactoryElement<int> maxConcurrentConnections, DataFactoryElement<bool> disableMetricsCollection, IDictionary<string, BinaryData> additionalProperties, DataFactoryElement<string> queryTimeout, BinaryData additionalColumns, DataFactoryElement<string> query) : base(copySourceType, sourceRetryCount, sourceRetryWait, maxConcurrentConnections, disableMetricsCollection, additionalProperties, queryTimeout, additionalColumns)
+        internal EloquaSource(string copySourceType, DataFactoryElement<int> sourceRetryCount, DataFactoryElement<string> sourceRetryWait, DataFactoryElement<int> maxConcurrentConnections, DataFactoryElement<bool> disableMetricsCollection, IDictionary<string, DataFactoryElement<string>> additionalProperties, DataFactoryElement<string> queryTimeout, BinaryData additionalColumns, DataFactoryElement<string> query) : base(copySourceType, sourceRetryCount, sourceRetryWait, maxConcurrentConnections, disableMetricsCollection, additionalProperties, queryTimeout, additionalColumns)
         {
             Query = query;
             CopySourceType = copySourceType ?? "EloquaSource";
diff --git a/src/AzureDataFactory.TestingFramework/Generated/Models/ExcelDataset.Serialization.cs b/src/AzureDataFactory.TestingFramework/Generated/Models/ExcelDataset.Serialization.cs
index c7d75173..bd0e71a9 100644
--- a/src/AzureDataFactory.TestingFramework/Generated/Models/ExcelDataset.Serialization.cs
+++ b/src/AzureDataFactory.TestingFramework/Generated/Models/ExcelDataset.Serialization.cs
@@ -140,8 +140,8 @@ internal static ExcelDataset DeserializeExcelDataset(JsonElement element)
             Optional<DataFactoryElement<bool>> firstRowAsHeader = default;
             Optional<DatasetCompression> compression = default;
             Optional<DataFactoryElement<string>> nullValue = default;
-            IDictionary<string, BinaryData> additionalProperties = default;
-            Dictionary<string, BinaryData> additionalPropertiesDictionary = new Dictionary<string, BinaryData>();
+            IDictionary<string, DataFactoryElement<string>> additionalProperties = default;
+            Dictionary<string, DataFactoryElement<string>> additionalPropertiesDictionary = new Dictionary<string, DataFactoryElement<string>>();
             foreach (var property in element.EnumerateObject())
             {
                 if (property.NameEquals("type"u8))
@@ -296,7 +296,7 @@ internal static ExcelDataset DeserializeExcelDataset(JsonElement element)
                     }
                     continue;
                 }
-                additionalPropertiesDictionary.Add(property.Name, BinaryData.FromString(property.Value.GetRawText()));
+                additionalPropertiesDictionary.Add(property.Name, JsonSerializer.Deserialize<DataFactoryElement<string>>(property.Value.GetRawText()));
             }
             additionalProperties = additionalPropertiesDictionary;
             return new ExcelDataset(type, description.Value, structure.Value, schema.Value, linkedServiceName, Optional.ToDictionary(parameters), Optional.ToList(annotations), folder.Value, additionalProperties, location.Value, sheetName.Value, sheetIndex.Value, range.Value, firstRowAsHeader.Value, compression.Value, nullValue.Value);
diff --git a/src/AzureDataFactory.TestingFramework/Generated/Models/ExcelDataset.cs b/src/AzureDataFactory.TestingFramework/Generated/Models/ExcelDataset.cs
index 2703bffa..3d9e42b2 100644
--- a/src/AzureDataFactory.TestingFramework/Generated/Models/ExcelDataset.cs
+++ b/src/AzureDataFactory.TestingFramework/Generated/Models/ExcelDataset.cs
@@ -44,7 +44,7 @@ public ExcelDataset(DataFactoryLinkedServiceReference linkedServiceName) : base(
         /// <param name="firstRowAsHeader"> When used as input, treat the first row of data as headers. When used as output,write the headers into the output as the first row of data. The default value is false. Type: boolean (or Expression with resultType boolean). </param>
         /// <param name="compression"> The data compression method used for the json dataset. </param>
         /// <param name="nullValue"> The null value string. Type: string (or Expression with resultType string). </param>
-        internal ExcelDataset(string datasetType, string description, DataFactoryElement<IList<DatasetDataElement>> structure, DataFactoryElement<IList<DatasetSchemaDataElement>> schema, DataFactoryLinkedServiceReference linkedServiceName, IDictionary<string, EntityParameterSpecification> parameters, IList<BinaryData> annotations, DatasetFolder folder, IDictionary<string, BinaryData> additionalProperties, DatasetLocation dataLocation, DataFactoryElement<string> sheetName, DataFactoryElement<int> sheetIndex, DataFactoryElement<string> range, DataFactoryElement<bool> firstRowAsHeader, DatasetCompression compression, DataFactoryElement<string> nullValue) : base(datasetType, description, structure, schema, linkedServiceName, parameters, annotations, folder, additionalProperties)
+        internal ExcelDataset(string datasetType, string description, DataFactoryElement<IList<DatasetDataElement>> structure, DataFactoryElement<IList<DatasetSchemaDataElement>> schema, DataFactoryLinkedServiceReference linkedServiceName, IDictionary<string, EntityParameterSpecification> parameters, IList<BinaryData> annotations, DatasetFolder folder, IDictionary<string, DataFactoryElement<string>> additionalProperties, DatasetLocation dataLocation, DataFactoryElement<string> sheetName, DataFactoryElement<int> sheetIndex, DataFactoryElement<string> range, DataFactoryElement<bool> firstRowAsHeader, DatasetCompression compression, DataFactoryElement<string> nullValue) : base(datasetType, description, structure, schema, linkedServiceName, parameters, annotations, folder, additionalProperties)
         {
             DataLocation = dataLocation;
             SheetName = sheetName;
diff --git a/src/AzureDataFactory.TestingFramework/Generated/Models/ExcelSource.Serialization.cs b/src/AzureDataFactory.TestingFramework/Generated/Models/ExcelSource.Serialization.cs
index 29e0c6e4..2db99db4 100644
--- a/src/AzureDataFactory.TestingFramework/Generated/Models/ExcelSource.Serialization.cs
+++ b/src/AzureDataFactory.TestingFramework/Generated/Models/ExcelSource.Serialization.cs
@@ -77,8 +77,8 @@ internal static ExcelSource DeserializeExcelSource(JsonElement element)
             Optional<DataFactoryElement<string>> sourceRetryWait = default;
             Optional<DataFactoryElement<int>> maxConcurrentConnections = default;
             Optional<DataFactoryElement<bool>> disableMetricsCollection = default;
-            IDictionary<string, BinaryData> additionalProperties = default;
-            Dictionary<string, BinaryData> additionalPropertiesDictionary = new Dictionary<string, BinaryData>();
+            IDictionary<string, DataFactoryElement<string>> additionalProperties = default;
+            Dictionary<string, DataFactoryElement<string>> additionalPropertiesDictionary = new Dictionary<string, DataFactoryElement<string>>();
             foreach (var property in element.EnumerateObject())
             {
                 if (property.NameEquals("storeSettings"u8))
@@ -140,7 +140,7 @@ internal static ExcelSource DeserializeExcelSource(JsonElement element)
                     disableMetricsCollection = JsonSerializer.Deserialize<DataFactoryElement<bool>>(property.Value.GetRawText());
                     continue;
                 }
-                additionalPropertiesDictionary.Add(property.Name, BinaryData.FromString(property.Value.GetRawText()));
+                additionalPropertiesDictionary.Add(property.Name, JsonSerializer.Deserialize<DataFactoryElement<string>>(property.Value.GetRawText()));
             }
             additionalProperties = additionalPropertiesDictionary;
             return new ExcelSource(type, sourceRetryCount.Value, sourceRetryWait.Value, maxConcurrentConnections.Value, disableMetricsCollection.Value, additionalProperties, storeSettings.Value, additionalColumns.Value);
diff --git a/src/AzureDataFactory.TestingFramework/Generated/Models/ExcelSource.cs b/src/AzureDataFactory.TestingFramework/Generated/Models/ExcelSource.cs
index 794b461a..61f8db7b 100644
--- a/src/AzureDataFactory.TestingFramework/Generated/Models/ExcelSource.cs
+++ b/src/AzureDataFactory.TestingFramework/Generated/Models/ExcelSource.cs
@@ -31,7 +31,7 @@ public ExcelSource()
         /// The available derived classes include <see cref="AmazonS3CompatibleReadSettings"/>, <see cref="AmazonS3ReadSettings"/>, <see cref="AzureBlobFSReadSettings"/>, <see cref="AzureBlobStorageReadSettings"/>, <see cref="AzureDataLakeStoreReadSettings"/>, <see cref="AzureFileStorageReadSettings"/>, <see cref="FileServerReadSettings"/>, <see cref="FtpReadSettings"/>, <see cref="GoogleCloudStorageReadSettings"/>, <see cref="HdfsReadSettings"/>, <see cref="HttpReadSettings"/>, <see cref="OracleCloudStorageReadSettings"/> and <see cref="SftpReadSettings"/>.
         /// </param>
         /// <param name="additionalColumns"> Specifies the additional columns to be added to source data. Type: array of objects(AdditionalColumns) (or Expression with resultType array of objects). </param>
-        internal ExcelSource(string copySourceType, DataFactoryElement<int> sourceRetryCount, DataFactoryElement<string> sourceRetryWait, DataFactoryElement<int> maxConcurrentConnections, DataFactoryElement<bool> disableMetricsCollection, IDictionary<string, BinaryData> additionalProperties, StoreReadSettings storeSettings, BinaryData additionalColumns) : base(copySourceType, sourceRetryCount, sourceRetryWait, maxConcurrentConnections, disableMetricsCollection, additionalProperties)
+        internal ExcelSource(string copySourceType, DataFactoryElement<int> sourceRetryCount, DataFactoryElement<string> sourceRetryWait, DataFactoryElement<int> maxConcurrentConnections, DataFactoryElement<bool> disableMetricsCollection, IDictionary<string, DataFactoryElement<string>> additionalProperties, StoreReadSettings storeSettings, BinaryData additionalColumns) : base(copySourceType, sourceRetryCount, sourceRetryWait, maxConcurrentConnections, disableMetricsCollection, additionalProperties)
         {
             StoreSettings = storeSettings;
             AdditionalColumns = additionalColumns;
diff --git a/src/AzureDataFactory.TestingFramework/Generated/Models/ExecuteDataFlowActivity.Serialization.cs b/src/AzureDataFactory.TestingFramework/Generated/Models/ExecuteDataFlowActivity.Serialization.cs
index 027c49f8..3b4ddbac 100644
--- a/src/AzureDataFactory.TestingFramework/Generated/Models/ExecuteDataFlowActivity.Serialization.cs
+++ b/src/AzureDataFactory.TestingFramework/Generated/Models/ExecuteDataFlowActivity.Serialization.cs
@@ -140,8 +140,8 @@ internal static ExecuteDataFlowActivity DeserializeExecuteDataFlowActivity(JsonE
             Optional<DataFactoryElement<bool>> continueOnError = default;
             Optional<DataFactoryElement<bool>> runConcurrently = default;
             Optional<DataFactoryElement<int>> sourceStagingConcurrency = default;
-            IDictionary<string, BinaryData> additionalProperties = default;
-            Dictionary<string, BinaryData> additionalPropertiesDictionary = new Dictionary<string, BinaryData>();
+            IDictionary<string, DataFactoryElement<string>> additionalProperties = default;
+            Dictionary<string, DataFactoryElement<string>> additionalPropertiesDictionary = new Dictionary<string, DataFactoryElement<string>>();
             foreach (var property in element.EnumerateObject())
             {
                 if (property.NameEquals("linkedServiceName"u8))
@@ -303,7 +303,7 @@ internal static ExecuteDataFlowActivity DeserializeExecuteDataFlowActivity(JsonE
                     }
                     continue;
                 }
-                additionalPropertiesDictionary.Add(property.Name, BinaryData.FromString(property.Value.GetRawText()));
+                additionalPropertiesDictionary.Add(property.Name, JsonSerializer.Deserialize<DataFactoryElement<string>>(property.Value.GetRawText()));
             }
             additionalProperties = additionalPropertiesDictionary;
             return new ExecuteDataFlowActivity(name, type, description.Value, Optional.ToNullable(state), Optional.ToNullable(onInactiveMarkAs), Optional.ToList(dependsOn), Optional.ToList(userProperties), additionalProperties, linkedServiceName, policy.Value, dataFlow, staging.Value, integrationRuntime.Value, compute.Value, traceLevel.Value, continueOnError.Value, runConcurrently.Value, sourceStagingConcurrency.Value);
diff --git a/src/AzureDataFactory.TestingFramework/Generated/Models/ExecuteDataFlowActivity.cs b/src/AzureDataFactory.TestingFramework/Generated/Models/ExecuteDataFlowActivity.cs
index 6044fc16..95f31248 100644
--- a/src/AzureDataFactory.TestingFramework/Generated/Models/ExecuteDataFlowActivity.cs
+++ b/src/AzureDataFactory.TestingFramework/Generated/Models/ExecuteDataFlowActivity.cs
@@ -45,7 +45,7 @@ public ExecuteDataFlowActivity(string name, DataFlowReference dataFlow) : base(n
         /// <param name="continueOnError"> Continue on error setting used for data flow execution. Enables processing to continue if a sink fails. Type: boolean (or Expression with resultType boolean). </param>
         /// <param name="runConcurrently"> Concurrent run setting used for data flow execution. Allows sinks with the same save order to be processed concurrently. Type: boolean (or Expression with resultType boolean). </param>
         /// <param name="sourceStagingConcurrency"> Specify number of parallel staging for sources applicable to the sink. Type: integer (or Expression with resultType integer). </param>
-        internal ExecuteDataFlowActivity(string name, string activityType, string description, PipelineActivityState? state, ActivityOnInactiveMarkAs? onInactiveMarkAs, IList<PipelineActivityDependency> dependsOn, IList<PipelineActivityUserProperty> userProperties, IDictionary<string, BinaryData> additionalProperties, DataFactoryLinkedServiceReference linkedServiceName, PipelineActivityPolicy policy, DataFlowReference dataFlow, DataFlowStagingInfo staging, IntegrationRuntimeReference integrationRuntime, ExecuteDataFlowActivityComputeType compute, DataFactoryElement<string> traceLevel, DataFactoryElement<bool> continueOnError, DataFactoryElement<bool> runConcurrently, DataFactoryElement<int> sourceStagingConcurrency) : base(name, activityType, description, state, onInactiveMarkAs, dependsOn, userProperties, additionalProperties, linkedServiceName, policy)
+        internal ExecuteDataFlowActivity(string name, string activityType, string description, PipelineActivityState? state, ActivityOnInactiveMarkAs? onInactiveMarkAs, IList<PipelineActivityDependency> dependsOn, IList<PipelineActivityUserProperty> userProperties, IDictionary<string, DataFactoryElement<string>> additionalProperties, DataFactoryLinkedServiceReference linkedServiceName, PipelineActivityPolicy policy, DataFlowReference dataFlow, DataFlowStagingInfo staging, IntegrationRuntimeReference integrationRuntime, ExecuteDataFlowActivityComputeType compute, DataFactoryElement<string> traceLevel, DataFactoryElement<bool> continueOnError, DataFactoryElement<bool> runConcurrently, DataFactoryElement<int> sourceStagingConcurrency) : base(name, activityType, description, state, onInactiveMarkAs, dependsOn, userProperties, additionalProperties, linkedServiceName, policy)
         {
             DataFlow = dataFlow;
             Staging = staging;
diff --git a/src/AzureDataFactory.TestingFramework/Generated/Models/ExecutePipelineActivity.Serialization.cs b/src/AzureDataFactory.TestingFramework/Generated/Models/ExecutePipelineActivity.Serialization.cs
index eeef163a..5c01f94b 100644
--- a/src/AzureDataFactory.TestingFramework/Generated/Models/ExecutePipelineActivity.Serialization.cs
+++ b/src/AzureDataFactory.TestingFramework/Generated/Models/ExecutePipelineActivity.Serialization.cs
@@ -119,8 +119,8 @@ internal static ExecutePipelineActivity DeserializeExecutePipelineActivity(JsonE
             DataFactoryPipelineReference pipeline = default;
             Optional<IDictionary<string, DataFactoryElement<string>>> parameters = default;
             Optional<bool> waitOnCompletion = default;
-            IDictionary<string, BinaryData> additionalProperties = default;
-            Dictionary<string, BinaryData> additionalPropertiesDictionary = new Dictionary<string, BinaryData>();
+            IDictionary<string, DataFactoryElement<string>> additionalProperties = default;
+            Dictionary<string, DataFactoryElement<string>> additionalPropertiesDictionary = new Dictionary<string, DataFactoryElement<string>>();
             foreach (var property in element.EnumerateObject())
             {
                 if (property.NameEquals("policy"u8))
@@ -240,7 +240,7 @@ internal static ExecutePipelineActivity DeserializeExecutePipelineActivity(JsonE
                     }
                     continue;
                 }
-                additionalPropertiesDictionary.Add(property.Name, BinaryData.FromString(property.Value.GetRawText()));
+                additionalPropertiesDictionary.Add(property.Name, JsonSerializer.Deserialize<DataFactoryElement<string>>(property.Value.GetRawText()));
             }
             additionalProperties = additionalPropertiesDictionary;
             return new ExecutePipelineActivity(name, type, description.Value, Optional.ToNullable(state), Optional.ToNullable(onInactiveMarkAs), Optional.ToList(dependsOn), Optional.ToList(userProperties), additionalProperties, policy.Value, pipeline, Optional.ToDictionary(parameters), Optional.ToNullable(waitOnCompletion));
diff --git a/src/AzureDataFactory.TestingFramework/Generated/Models/ExecutePipelineActivity.cs b/src/AzureDataFactory.TestingFramework/Generated/Models/ExecutePipelineActivity.cs
index 2ec21716..c838994e 100644
--- a/src/AzureDataFactory.TestingFramework/Generated/Models/ExecutePipelineActivity.cs
+++ b/src/AzureDataFactory.TestingFramework/Generated/Models/ExecutePipelineActivity.cs
@@ -40,7 +40,7 @@ public ExecutePipelineActivity(string name, DataFactoryPipelineReference pipelin
         /// <param name="pipeline"> Pipeline reference. </param>
         /// <param name="parameters"> Pipeline parameters. </param>
         /// <param name="waitOnCompletion"> Defines whether activity execution will wait for the dependent pipeline execution to finish. Default is false. </param>
-        internal ExecutePipelineActivity(string name, string activityType, string description, PipelineActivityState? state, ActivityOnInactiveMarkAs? onInactiveMarkAs, IList<PipelineActivityDependency> dependsOn, IList<PipelineActivityUserProperty> userProperties, IDictionary<string, BinaryData> additionalProperties, ExecutePipelineActivityPolicy policy, DataFactoryPipelineReference pipeline, IDictionary<string, DataFactoryElement<string>> parameters, bool? waitOnCompletion) : base(name, activityType, description, state, onInactiveMarkAs, dependsOn, userProperties, additionalProperties)
+        internal ExecutePipelineActivity(string name, string activityType, string description, PipelineActivityState? state, ActivityOnInactiveMarkAs? onInactiveMarkAs, IList<PipelineActivityDependency> dependsOn, IList<PipelineActivityUserProperty> userProperties, IDictionary<string, DataFactoryElement<string>> additionalProperties, ExecutePipelineActivityPolicy policy, DataFactoryPipelineReference pipeline, IDictionary<string, DataFactoryElement<string>> parameters, bool? waitOnCompletion) : base(name, activityType, description, state, onInactiveMarkAs, dependsOn, userProperties, additionalProperties)
         {
             Policy = policy;
             Pipeline = pipeline;
diff --git a/src/AzureDataFactory.TestingFramework/Generated/Models/ExecutePipelineActivityPolicy.Serialization.cs b/src/AzureDataFactory.TestingFramework/Generated/Models/ExecutePipelineActivityPolicy.Serialization.cs
index 6c368e56..57c4a7be 100644
--- a/src/AzureDataFactory.TestingFramework/Generated/Models/ExecutePipelineActivityPolicy.Serialization.cs
+++ b/src/AzureDataFactory.TestingFramework/Generated/Models/ExecutePipelineActivityPolicy.Serialization.cs
@@ -7,6 +7,7 @@
 
 using System.Text.Json;
 using Azure.Core;
+using Azure.Core.Expressions.DataFactory;
 
 namespace AzureDataFactory.TestingFramework.Models
 {
@@ -39,8 +40,8 @@ internal static ExecutePipelineActivityPolicy DeserializeExecutePipelineActivity
                 return null;
             }
             Optional<bool> secureInput = default;
-            IDictionary<string, BinaryData> additionalProperties = default;
-            Dictionary<string, BinaryData> additionalPropertiesDictionary = new Dictionary<string, BinaryData>();
+            IDictionary<string, DataFactoryElement<string>> additionalProperties = default;
+            Dictionary<string, DataFactoryElement<string>> additionalPropertiesDictionary = new Dictionary<string, DataFactoryElement<string>>();
             foreach (var property in element.EnumerateObject())
             {
                 if (property.NameEquals("secureInput"u8))
@@ -52,7 +53,7 @@ internal static ExecutePipelineActivityPolicy DeserializeExecutePipelineActivity
                     secureInput = property.Value.GetBoolean();
                     continue;
                 }
-                additionalPropertiesDictionary.Add(property.Name, BinaryData.FromString(property.Value.GetRawText()));
+                additionalPropertiesDictionary.Add(property.Name, JsonSerializer.Deserialize<DataFactoryElement<string>>(property.Value.GetRawText()));
             }
             additionalProperties = additionalPropertiesDictionary;
             return new ExecutePipelineActivityPolicy(Optional.ToNullable(secureInput), additionalProperties);
diff --git a/src/AzureDataFactory.TestingFramework/Generated/Models/ExecutePipelineActivityPolicy.cs b/src/AzureDataFactory.TestingFramework/Generated/Models/ExecutePipelineActivityPolicy.cs
index 07e56f63..3074c71b 100644
--- a/src/AzureDataFactory.TestingFramework/Generated/Models/ExecutePipelineActivityPolicy.cs
+++ b/src/AzureDataFactory.TestingFramework/Generated/Models/ExecutePipelineActivityPolicy.cs
@@ -6,6 +6,7 @@
 #nullable disable
 
 using Azure.Core;
+using Azure.Core.Expressions.DataFactory;
 
 namespace AzureDataFactory.TestingFramework.Models
 {
@@ -15,13 +16,13 @@ public partial class ExecutePipelineActivityPolicy
         /// <summary> Initializes a new instance of ExecutePipelineActivityPolicy. </summary>
         public ExecutePipelineActivityPolicy()
         {
-            AdditionalProperties = new ChangeTrackingDictionary<string, BinaryData>();
+            AdditionalProperties = new ChangeTrackingDictionary<string, DataFactoryElement<string>>();
         }
 
         /// <summary> Initializes a new instance of ExecutePipelineActivityPolicy. </summary>
         /// <param name="isSecureInputEnabled"> When set to true, Input from activity is considered as secure and will not be logged to monitoring. </param>
         /// <param name="additionalProperties"> Additional Properties. </param>
-        internal ExecutePipelineActivityPolicy(bool? isSecureInputEnabled, IDictionary<string, BinaryData> additionalProperties)
+        internal ExecutePipelineActivityPolicy(bool? isSecureInputEnabled, IDictionary<string, DataFactoryElement<string>> additionalProperties)
         {
             IsSecureInputEnabled = isSecureInputEnabled;
             AdditionalProperties = additionalProperties;
@@ -59,6 +60,6 @@ internal ExecutePipelineActivityPolicy(bool? isSecureInputEnabled, IDictionary<s
         /// </list>
         /// </para>
         /// </summary>
-        public IDictionary<string, BinaryData> AdditionalProperties { get; }
+        public IDictionary<string, DataFactoryElement<string>> AdditionalProperties { get; }
     }
 }
diff --git a/src/AzureDataFactory.TestingFramework/Generated/Models/ExecuteSsisPackageActivity.Serialization.cs b/src/AzureDataFactory.TestingFramework/Generated/Models/ExecuteSsisPackageActivity.Serialization.cs
index 281eb3f1..25967555 100644
--- a/src/AzureDataFactory.TestingFramework/Generated/Models/ExecuteSsisPackageActivity.Serialization.cs
+++ b/src/AzureDataFactory.TestingFramework/Generated/Models/ExecuteSsisPackageActivity.Serialization.cs
@@ -213,8 +213,8 @@ internal static ExecuteSsisPackageActivity DeserializeExecuteSsisPackageActivity
             Optional<IDictionary<string, IDictionary<string, SsisExecutionParameter>>> packageConnectionManagers = default;
             Optional<IDictionary<string, SsisPropertyOverride>> propertyOverrides = default;
             Optional<SsisLogLocation> logLocation = default;
-            IDictionary<string, BinaryData> additionalProperties = default;
-            Dictionary<string, BinaryData> additionalPropertiesDictionary = new Dictionary<string, BinaryData>();
+            IDictionary<string, DataFactoryElement<string>> additionalProperties = default;
+            Dictionary<string, DataFactoryElement<string>> additionalPropertiesDictionary = new Dictionary<string, DataFactoryElement<string>>();
             foreach (var property in element.EnumerateObject())
             {
                 if (property.NameEquals("linkedServiceName"u8))
@@ -457,7 +457,7 @@ internal static ExecuteSsisPackageActivity DeserializeExecuteSsisPackageActivity
                     }
                     continue;
                 }
-                additionalPropertiesDictionary.Add(property.Name, BinaryData.FromString(property.Value.GetRawText()));
+                additionalPropertiesDictionary.Add(property.Name, JsonSerializer.Deserialize<DataFactoryElement<string>>(property.Value.GetRawText()));
             }
             additionalProperties = additionalPropertiesDictionary;
             return new ExecuteSsisPackageActivity(name, type, description.Value, Optional.ToNullable(state), Optional.ToNullable(onInactiveMarkAs), Optional.ToList(dependsOn), Optional.ToList(userProperties), additionalProperties, linkedServiceName, policy.Value, packageLocation, runtime.Value, loggingLevel.Value, environmentPath.Value, executionCredential.Value, connectVia, Optional.ToDictionary(projectParameters), Optional.ToDictionary(packageParameters), Optional.ToDictionary(projectConnectionManagers), Optional.ToDictionary(packageConnectionManagers), Optional.ToDictionary(propertyOverrides), logLocation.Value);
diff --git a/src/AzureDataFactory.TestingFramework/Generated/Models/ExecuteSsisPackageActivity.cs b/src/AzureDataFactory.TestingFramework/Generated/Models/ExecuteSsisPackageActivity.cs
index 527b8c4a..19f9eafa 100644
--- a/src/AzureDataFactory.TestingFramework/Generated/Models/ExecuteSsisPackageActivity.cs
+++ b/src/AzureDataFactory.TestingFramework/Generated/Models/ExecuteSsisPackageActivity.cs
@@ -57,7 +57,7 @@ public ExecuteSsisPackageActivity(string name, SsisPackageLocation packageLocati
         /// <param name="packageConnectionManagers"> The package level connection managers to execute the SSIS package. </param>
         /// <param name="propertyOverrides"> The property overrides to execute the SSIS package. </param>
         /// <param name="logLocation"> SSIS package execution log location. </param>
-        internal ExecuteSsisPackageActivity(string name, string activityType, string description, PipelineActivityState? state, ActivityOnInactiveMarkAs? onInactiveMarkAs, IList<PipelineActivityDependency> dependsOn, IList<PipelineActivityUserProperty> userProperties, IDictionary<string, BinaryData> additionalProperties, DataFactoryLinkedServiceReference linkedServiceName, PipelineActivityPolicy policy, SsisPackageLocation packageLocation, DataFactoryElement<string> runtime, DataFactoryElement<string> loggingLevel, DataFactoryElement<string> environmentPath, SsisExecutionCredential executionCredential, IntegrationRuntimeReference connectVia, IDictionary<string, SsisExecutionParameter> projectParameters, IDictionary<string, SsisExecutionParameter> packageParameters, IDictionary<string, IDictionary<string, SsisExecutionParameter>> projectConnectionManagers, IDictionary<string, IDictionary<string, SsisExecutionParameter>> packageConnectionManagers, IDictionary<string, SsisPropertyOverride> propertyOverrides, SsisLogLocation logLocation) : base(name, activityType, description, state, onInactiveMarkAs, dependsOn, userProperties, additionalProperties, linkedServiceName, policy)
+        internal ExecuteSsisPackageActivity(string name, string activityType, string description, PipelineActivityState? state, ActivityOnInactiveMarkAs? onInactiveMarkAs, IList<PipelineActivityDependency> dependsOn, IList<PipelineActivityUserProperty> userProperties, IDictionary<string, DataFactoryElement<string>> additionalProperties, DataFactoryLinkedServiceReference linkedServiceName, PipelineActivityPolicy policy, SsisPackageLocation packageLocation, DataFactoryElement<string> runtime, DataFactoryElement<string> loggingLevel, DataFactoryElement<string> environmentPath, SsisExecutionCredential executionCredential, IntegrationRuntimeReference connectVia, IDictionary<string, SsisExecutionParameter> projectParameters, IDictionary<string, SsisExecutionParameter> packageParameters, IDictionary<string, IDictionary<string, SsisExecutionParameter>> projectConnectionManagers, IDictionary<string, IDictionary<string, SsisExecutionParameter>> packageConnectionManagers, IDictionary<string, SsisPropertyOverride> propertyOverrides, SsisLogLocation logLocation) : base(name, activityType, description, state, onInactiveMarkAs, dependsOn, userProperties, additionalProperties, linkedServiceName, policy)
         {
             PackageLocation = packageLocation;
             Runtime = runtime;
diff --git a/src/AzureDataFactory.TestingFramework/Generated/Models/ExecuteWranglingDataflowActivity.Serialization.cs b/src/AzureDataFactory.TestingFramework/Generated/Models/ExecuteWranglingDataflowActivity.Serialization.cs
index 53e8126b..00735865 100644
--- a/src/AzureDataFactory.TestingFramework/Generated/Models/ExecuteWranglingDataflowActivity.Serialization.cs
+++ b/src/AzureDataFactory.TestingFramework/Generated/Models/ExecuteWranglingDataflowActivity.Serialization.cs
@@ -157,8 +157,8 @@ internal static ExecuteWranglingDataflowActivity DeserializeExecuteWranglingData
             Optional<DataFactoryElement<int>> sourceStagingConcurrency = default;
             Optional<IDictionary<string, PowerQuerySink>> sinks = default;
             Optional<IList<PowerQuerySinkMapping>> queries = default;
-            IDictionary<string, BinaryData> additionalProperties = default;
-            Dictionary<string, BinaryData> additionalPropertiesDictionary = new Dictionary<string, BinaryData>();
+            IDictionary<string, DataFactoryElement<string>> additionalProperties = default;
+            Dictionary<string, DataFactoryElement<string>> additionalPropertiesDictionary = new Dictionary<string, DataFactoryElement<string>>();
             foreach (var property in element.EnumerateObject())
             {
                 if (property.NameEquals("policy"u8))
@@ -339,7 +339,7 @@ internal static ExecuteWranglingDataflowActivity DeserializeExecuteWranglingData
                     }
                     continue;
                 }
-                additionalPropertiesDictionary.Add(property.Name, BinaryData.FromString(property.Value.GetRawText()));
+                additionalPropertiesDictionary.Add(property.Name, JsonSerializer.Deserialize<DataFactoryElement<string>>(property.Value.GetRawText()));
             }
             additionalProperties = additionalPropertiesDictionary;
             return new ExecuteWranglingDataflowActivity(name, type, description.Value, Optional.ToNullable(state), Optional.ToNullable(onInactiveMarkAs), Optional.ToList(dependsOn), Optional.ToList(userProperties), additionalProperties, policy.Value, dataFlow, staging.Value, integrationRuntime.Value, compute.Value, traceLevel.Value, continueOnError.Value, runConcurrently.Value, sourceStagingConcurrency.Value, Optional.ToDictionary(sinks), Optional.ToList(queries));
diff --git a/src/AzureDataFactory.TestingFramework/Generated/Models/ExecuteWranglingDataflowActivity.cs b/src/AzureDataFactory.TestingFramework/Generated/Models/ExecuteWranglingDataflowActivity.cs
index 414d2204..51416941 100644
--- a/src/AzureDataFactory.TestingFramework/Generated/Models/ExecuteWranglingDataflowActivity.cs
+++ b/src/AzureDataFactory.TestingFramework/Generated/Models/ExecuteWranglingDataflowActivity.cs
@@ -48,7 +48,7 @@ public ExecuteWranglingDataflowActivity(string name, DataFlowReference dataFlow)
         /// <param name="sourceStagingConcurrency"> Specify number of parallel staging for sources applicable to the sink. Type: integer (or Expression with resultType integer). </param>
         /// <param name="sinks"> (Deprecated. Please use Queries). List of Power Query activity sinks mapped to a queryName. </param>
         /// <param name="queries"> List of mapping for Power Query mashup query to sink dataset(s). </param>
-        internal ExecuteWranglingDataflowActivity(string name, string activityType, string description, PipelineActivityState? state, ActivityOnInactiveMarkAs? onInactiveMarkAs, IList<PipelineActivityDependency> dependsOn, IList<PipelineActivityUserProperty> userProperties, IDictionary<string, BinaryData> additionalProperties, PipelineActivityPolicy policy, DataFlowReference dataFlow, DataFlowStagingInfo staging, IntegrationRuntimeReference integrationRuntime, ExecuteDataFlowActivityComputeType compute, DataFactoryElement<string> traceLevel, DataFactoryElement<bool> continueOnError, DataFactoryElement<bool> runConcurrently, DataFactoryElement<int> sourceStagingConcurrency, IDictionary<string, PowerQuerySink> sinks, IList<PowerQuerySinkMapping> queries) : base(name, activityType, description, state, onInactiveMarkAs, dependsOn, userProperties, additionalProperties)
+        internal ExecuteWranglingDataflowActivity(string name, string activityType, string description, PipelineActivityState? state, ActivityOnInactiveMarkAs? onInactiveMarkAs, IList<PipelineActivityDependency> dependsOn, IList<PipelineActivityUserProperty> userProperties, IDictionary<string, DataFactoryElement<string>> additionalProperties, PipelineActivityPolicy policy, DataFlowReference dataFlow, DataFlowStagingInfo staging, IntegrationRuntimeReference integrationRuntime, ExecuteDataFlowActivityComputeType compute, DataFactoryElement<string> traceLevel, DataFactoryElement<bool> continueOnError, DataFactoryElement<bool> runConcurrently, DataFactoryElement<int> sourceStagingConcurrency, IDictionary<string, PowerQuerySink> sinks, IList<PowerQuerySinkMapping> queries) : base(name, activityType, description, state, onInactiveMarkAs, dependsOn, userProperties, additionalProperties)
         {
             Policy = policy;
             DataFlow = dataFlow;
diff --git a/src/AzureDataFactory.TestingFramework/Generated/Models/ExecutionActivity.Serialization.cs b/src/AzureDataFactory.TestingFramework/Generated/Models/ExecutionActivity.Serialization.cs
index 8ec40c48..791bf1d3 100644
--- a/src/AzureDataFactory.TestingFramework/Generated/Models/ExecutionActivity.Serialization.cs
+++ b/src/AzureDataFactory.TestingFramework/Generated/Models/ExecutionActivity.Serialization.cs
@@ -124,8 +124,8 @@ internal static ExecutionActivity DeserializeExecutionActivity(JsonElement eleme
             Optional<ActivityOnInactiveMarkAs> onInactiveMarkAs = default;
             Optional<IList<PipelineActivityDependency>> dependsOn = default;
             Optional<IList<PipelineActivityUserProperty>> userProperties = default;
-            IDictionary<string, BinaryData> additionalProperties = default;
-            Dictionary<string, BinaryData> additionalPropertiesDictionary = new Dictionary<string, BinaryData>();
+            IDictionary<string, DataFactoryElement<string>> additionalProperties = default;
+            Dictionary<string, DataFactoryElement<string>> additionalPropertiesDictionary = new Dictionary<string, DataFactoryElement<string>>();
             foreach (var property in element.EnumerateObject())
             {
                 if (property.NameEquals("linkedServiceName"u8))
@@ -207,7 +207,7 @@ internal static ExecutionActivity DeserializeExecutionActivity(JsonElement eleme
                     userProperties = array;
                     continue;
                 }
-                additionalPropertiesDictionary.Add(property.Name, BinaryData.FromString(property.Value.GetRawText()));
+                additionalPropertiesDictionary.Add(property.Name, JsonSerializer.Deserialize<DataFactoryElement<string>>(property.Value.GetRawText()));
             }
             additionalProperties = additionalPropertiesDictionary;
             return new ExecutionActivity(name, type, description.Value, Optional.ToNullable(state), Optional.ToNullable(onInactiveMarkAs), Optional.ToList(dependsOn), Optional.ToList(userProperties), additionalProperties, linkedServiceName, policy.Value);
diff --git a/src/AzureDataFactory.TestingFramework/Generated/Models/ExecutionActivity.cs b/src/AzureDataFactory.TestingFramework/Generated/Models/ExecutionActivity.cs
index f769c358..4e73bd01 100644
--- a/src/AzureDataFactory.TestingFramework/Generated/Models/ExecutionActivity.cs
+++ b/src/AzureDataFactory.TestingFramework/Generated/Models/ExecutionActivity.cs
@@ -38,7 +38,7 @@ public ExecutionActivity(string name) : base(name)
         /// <param name="additionalProperties"> Additional Properties. </param>
         /// <param name="linkedServiceName"> Linked service reference. </param>
         /// <param name="policy"> Activity policy. </param>
-        internal ExecutionActivity(string name, string activityType, string description, PipelineActivityState? state, ActivityOnInactiveMarkAs? onInactiveMarkAs, IList<PipelineActivityDependency> dependsOn, IList<PipelineActivityUserProperty> userProperties, IDictionary<string, BinaryData> additionalProperties, DataFactoryLinkedServiceReference linkedServiceName, PipelineActivityPolicy policy) : base(name, activityType, description, state, onInactiveMarkAs, dependsOn, userProperties, additionalProperties)
+        internal ExecutionActivity(string name, string activityType, string description, PipelineActivityState? state, ActivityOnInactiveMarkAs? onInactiveMarkAs, IList<PipelineActivityDependency> dependsOn, IList<PipelineActivityUserProperty> userProperties, IDictionary<string, DataFactoryElement<string>> additionalProperties, DataFactoryLinkedServiceReference linkedServiceName, PipelineActivityPolicy policy) : base(name, activityType, description, state, onInactiveMarkAs, dependsOn, userProperties, additionalProperties)
         {
             LinkedServiceName = linkedServiceName;
             Policy = policy;
diff --git a/src/AzureDataFactory.TestingFramework/Generated/Models/ExportSettings.cs b/src/AzureDataFactory.TestingFramework/Generated/Models/ExportSettings.cs
index d05ae951..61785115 100644
--- a/src/AzureDataFactory.TestingFramework/Generated/Models/ExportSettings.cs
+++ b/src/AzureDataFactory.TestingFramework/Generated/Models/ExportSettings.cs
@@ -6,6 +6,7 @@
 #nullable disable
 
 using Azure.Core;
+using Azure.Core.Expressions.DataFactory;
 
 namespace AzureDataFactory.TestingFramework.Models
 {
@@ -19,13 +20,13 @@ public partial class ExportSettings
         /// <summary> Initializes a new instance of ExportSettings. </summary>
         public ExportSettings()
         {
-            AdditionalProperties = new ChangeTrackingDictionary<string, BinaryData>();
+            AdditionalProperties = new ChangeTrackingDictionary<string, DataFactoryElement<string>>();
         }
 
         /// <summary> Initializes a new instance of ExportSettings. </summary>
         /// <param name="exportSettingsType"> The export setting type. </param>
         /// <param name="additionalProperties"> Additional Properties. </param>
-        internal ExportSettings(string exportSettingsType, IDictionary<string, BinaryData> additionalProperties)
+        internal ExportSettings(string exportSettingsType, IDictionary<string, DataFactoryElement<string>> additionalProperties)
         {
             ExportSettingsType = exportSettingsType;
             AdditionalProperties = additionalProperties;
@@ -63,6 +64,6 @@ internal ExportSettings(string exportSettingsType, IDictionary<string, BinaryDat
         /// </list>
         /// </para>
         /// </summary>
-        public IDictionary<string, BinaryData> AdditionalProperties { get; }
+        public IDictionary<string, DataFactoryElement<string>> AdditionalProperties { get; }
     }
 }
diff --git a/src/AzureDataFactory.TestingFramework/Generated/Models/FailActivity.Serialization.cs b/src/AzureDataFactory.TestingFramework/Generated/Models/FailActivity.Serialization.cs
index 6938bd7e..59ba959b 100644
--- a/src/AzureDataFactory.TestingFramework/Generated/Models/FailActivity.Serialization.cs
+++ b/src/AzureDataFactory.TestingFramework/Generated/Models/FailActivity.Serialization.cs
@@ -89,8 +89,8 @@ internal static FailActivity DeserializeFailActivity(JsonElement element)
             Optional<IList<PipelineActivityUserProperty>> userProperties = default;
             DataFactoryElement<string> message = default;
             DataFactoryElement<string> errorCode = default;
-            IDictionary<string, BinaryData> additionalProperties = default;
-            Dictionary<string, BinaryData> additionalPropertiesDictionary = new Dictionary<string, BinaryData>();
+            IDictionary<string, DataFactoryElement<string>> additionalProperties = default;
+            Dictionary<string, DataFactoryElement<string>> additionalPropertiesDictionary = new Dictionary<string, DataFactoryElement<string>>();
             foreach (var property in element.EnumerateObject())
             {
                 if (property.NameEquals("name"u8))
@@ -176,7 +176,7 @@ internal static FailActivity DeserializeFailActivity(JsonElement element)
                     }
                     continue;
                 }
-                additionalPropertiesDictionary.Add(property.Name, BinaryData.FromString(property.Value.GetRawText()));
+                additionalPropertiesDictionary.Add(property.Name, JsonSerializer.Deserialize<DataFactoryElement<string>>(property.Value.GetRawText()));
             }
             additionalProperties = additionalPropertiesDictionary;
             return new FailActivity(name, type, description.Value, Optional.ToNullable(state), Optional.ToNullable(onInactiveMarkAs), Optional.ToList(dependsOn), Optional.ToList(userProperties), additionalProperties, message, errorCode);
diff --git a/src/AzureDataFactory.TestingFramework/Generated/Models/FailActivity.cs b/src/AzureDataFactory.TestingFramework/Generated/Models/FailActivity.cs
index fbe88ec0..da1fb9ec 100644
--- a/src/AzureDataFactory.TestingFramework/Generated/Models/FailActivity.cs
+++ b/src/AzureDataFactory.TestingFramework/Generated/Models/FailActivity.cs
@@ -40,7 +40,7 @@ public FailActivity(string name, DataFactoryElement<string> message, DataFactory
         /// <param name="additionalProperties"> Additional Properties. </param>
         /// <param name="message"> The error message that surfaced in the Fail activity. It can be dynamic content that's evaluated to a non empty/blank string at runtime. Type: string (or Expression with resultType string). </param>
         /// <param name="errorCode"> The error code that categorizes the error type of the Fail activity. It can be dynamic content that's evaluated to a non empty/blank string at runtime. Type: string (or Expression with resultType string). </param>
-        internal FailActivity(string name, string activityType, string description, PipelineActivityState? state, ActivityOnInactiveMarkAs? onInactiveMarkAs, IList<PipelineActivityDependency> dependsOn, IList<PipelineActivityUserProperty> userProperties, IDictionary<string, BinaryData> additionalProperties, DataFactoryElement<string> message, DataFactoryElement<string> errorCode) : base(name, activityType, description, state, onInactiveMarkAs, dependsOn, userProperties, additionalProperties)
+        internal FailActivity(string name, string activityType, string description, PipelineActivityState? state, ActivityOnInactiveMarkAs? onInactiveMarkAs, IList<PipelineActivityDependency> dependsOn, IList<PipelineActivityUserProperty> userProperties, IDictionary<string, DataFactoryElement<string>> additionalProperties, DataFactoryElement<string> message, DataFactoryElement<string> errorCode) : base(name, activityType, description, state, onInactiveMarkAs, dependsOn, userProperties, additionalProperties)
         {
             Message = message;
             ErrorCode = errorCode;
diff --git a/src/AzureDataFactory.TestingFramework/Generated/Models/FileServerLinkedService.Serialization.cs b/src/AzureDataFactory.TestingFramework/Generated/Models/FileServerLinkedService.Serialization.cs
index c27e5b23..0c7327bc 100644
--- a/src/AzureDataFactory.TestingFramework/Generated/Models/FileServerLinkedService.Serialization.cs
+++ b/src/AzureDataFactory.TestingFramework/Generated/Models/FileServerLinkedService.Serialization.cs
@@ -105,8 +105,8 @@ internal static FileServerLinkedService DeserializeFileServerLinkedService(JsonE
             Optional<DataFactoryElement<string>> userId = default;
             Optional<DataFactorySecretBaseDefinition> password = default;
             Optional<string> encryptedCredential = default;
-            IDictionary<string, BinaryData> additionalProperties = default;
-            Dictionary<string, BinaryData> additionalPropertiesDictionary = new Dictionary<string, BinaryData>();
+            IDictionary<string, DataFactoryElement<string>> additionalProperties = default;
+            Dictionary<string, DataFactoryElement<string>> additionalPropertiesDictionary = new Dictionary<string, DataFactoryElement<string>>();
             foreach (var property in element.EnumerateObject())
             {
                 if (property.NameEquals("type"u8))
@@ -203,7 +203,7 @@ internal static FileServerLinkedService DeserializeFileServerLinkedService(JsonE
                     }
                     continue;
                 }
-                additionalPropertiesDictionary.Add(property.Name, BinaryData.FromString(property.Value.GetRawText()));
+                additionalPropertiesDictionary.Add(property.Name, JsonSerializer.Deserialize<DataFactoryElement<string>>(property.Value.GetRawText()));
             }
             additionalProperties = additionalPropertiesDictionary;
             return new FileServerLinkedService(type, connectVia.Value, description.Value, Optional.ToDictionary(parameters), Optional.ToList(annotations), additionalProperties, host, userId.Value, password, encryptedCredential.Value);
diff --git a/src/AzureDataFactory.TestingFramework/Generated/Models/FileServerLinkedService.cs b/src/AzureDataFactory.TestingFramework/Generated/Models/FileServerLinkedService.cs
index cb7b6eb9..d186fbeb 100644
--- a/src/AzureDataFactory.TestingFramework/Generated/Models/FileServerLinkedService.cs
+++ b/src/AzureDataFactory.TestingFramework/Generated/Models/FileServerLinkedService.cs
@@ -35,7 +35,7 @@ public FileServerLinkedService(DataFactoryElement<string> host)
         /// <param name="userId"> User ID to logon the server. Type: string (or Expression with resultType string). </param>
         /// <param name="password"> Password to logon the server. </param>
         /// <param name="encryptedCredential"> The encrypted credential used for authentication. Credentials are encrypted using the integration runtime credential manager. Type: string. </param>
-        internal FileServerLinkedService(string linkedServiceType, IntegrationRuntimeReference connectVia, string description, IDictionary<string, EntityParameterSpecification> parameters, IList<BinaryData> annotations, IDictionary<string, BinaryData> additionalProperties, DataFactoryElement<string> host, DataFactoryElement<string> userId, DataFactorySecretBaseDefinition password, string encryptedCredential) : base(linkedServiceType, connectVia, description, parameters, annotations, additionalProperties)
+        internal FileServerLinkedService(string linkedServiceType, IntegrationRuntimeReference connectVia, string description, IDictionary<string, EntityParameterSpecification> parameters, IList<BinaryData> annotations, IDictionary<string, DataFactoryElement<string>> additionalProperties, DataFactoryElement<string> host, DataFactoryElement<string> userId, DataFactorySecretBaseDefinition password, string encryptedCredential) : base(linkedServiceType, connectVia, description, parameters, annotations, additionalProperties)
         {
             Host = host;
             UserId = userId;
diff --git a/src/AzureDataFactory.TestingFramework/Generated/Models/FileServerLocation.Serialization.cs b/src/AzureDataFactory.TestingFramework/Generated/Models/FileServerLocation.Serialization.cs
index a2288769..6ea44215 100644
--- a/src/AzureDataFactory.TestingFramework/Generated/Models/FileServerLocation.Serialization.cs
+++ b/src/AzureDataFactory.TestingFramework/Generated/Models/FileServerLocation.Serialization.cs
@@ -49,8 +49,8 @@ internal static FileServerLocation DeserializeFileServerLocation(JsonElement ele
             string type = default;
             Optional<DataFactoryElement<string>> folderPath = default;
             Optional<DataFactoryElement<string>> fileName = default;
-            IDictionary<string, BinaryData> additionalProperties = default;
-            Dictionary<string, BinaryData> additionalPropertiesDictionary = new Dictionary<string, BinaryData>();
+            IDictionary<string, DataFactoryElement<string>> additionalProperties = default;
+            Dictionary<string, DataFactoryElement<string>> additionalPropertiesDictionary = new Dictionary<string, DataFactoryElement<string>>();
             foreach (var property in element.EnumerateObject())
             {
                 if (property.NameEquals("type"u8))
@@ -76,7 +76,7 @@ internal static FileServerLocation DeserializeFileServerLocation(JsonElement ele
                     fileName = JsonSerializer.Deserialize<DataFactoryElement<string>>(property.Value.GetRawText());
                     continue;
                 }
-                additionalPropertiesDictionary.Add(property.Name, BinaryData.FromString(property.Value.GetRawText()));
+                additionalPropertiesDictionary.Add(property.Name, JsonSerializer.Deserialize<DataFactoryElement<string>>(property.Value.GetRawText()));
             }
             additionalProperties = additionalPropertiesDictionary;
             return new FileServerLocation(type, folderPath.Value, fileName.Value, additionalProperties);
diff --git a/src/AzureDataFactory.TestingFramework/Generated/Models/FileServerLocation.cs b/src/AzureDataFactory.TestingFramework/Generated/Models/FileServerLocation.cs
index 2c8ec132..793c304d 100644
--- a/src/AzureDataFactory.TestingFramework/Generated/Models/FileServerLocation.cs
+++ b/src/AzureDataFactory.TestingFramework/Generated/Models/FileServerLocation.cs
@@ -23,7 +23,7 @@ public FileServerLocation()
         /// <param name="folderPath"> Specify the folder path of dataset. Type: string (or Expression with resultType string). </param>
         /// <param name="fileName"> Specify the file name of dataset. Type: string (or Expression with resultType string). </param>
         /// <param name="additionalProperties"> Additional Properties. </param>
-        internal FileServerLocation(string datasetLocationType, DataFactoryElement<string> folderPath, DataFactoryElement<string> fileName, IDictionary<string, BinaryData> additionalProperties) : base(datasetLocationType, folderPath, fileName, additionalProperties)
+        internal FileServerLocation(string datasetLocationType, DataFactoryElement<string> folderPath, DataFactoryElement<string> fileName, IDictionary<string, DataFactoryElement<string>> additionalProperties) : base(datasetLocationType, folderPath, fileName, additionalProperties)
         {
             DatasetLocationType = datasetLocationType ?? "FileServerLocation";
         }
diff --git a/src/AzureDataFactory.TestingFramework/Generated/Models/FileServerReadSettings.Serialization.cs b/src/AzureDataFactory.TestingFramework/Generated/Models/FileServerReadSettings.Serialization.cs
index dc0ed59f..ef606fc2 100644
--- a/src/AzureDataFactory.TestingFramework/Generated/Models/FileServerReadSettings.Serialization.cs
+++ b/src/AzureDataFactory.TestingFramework/Generated/Models/FileServerReadSettings.Serialization.cs
@@ -109,8 +109,8 @@ internal static FileServerReadSettings DeserializeFileServerReadSettings(JsonEle
             string type = default;
             Optional<DataFactoryElement<int>> maxConcurrentConnections = default;
             Optional<DataFactoryElement<bool>> disableMetricsCollection = default;
-            IDictionary<string, BinaryData> additionalProperties = default;
-            Dictionary<string, BinaryData> additionalPropertiesDictionary = new Dictionary<string, BinaryData>();
+            IDictionary<string, DataFactoryElement<string>> additionalProperties = default;
+            Dictionary<string, DataFactoryElement<string>> additionalPropertiesDictionary = new Dictionary<string, DataFactoryElement<string>>();
             foreach (var property in element.EnumerateObject())
             {
                 if (property.NameEquals("recursive"u8))
@@ -226,7 +226,7 @@ internal static FileServerReadSettings DeserializeFileServerReadSettings(JsonEle
                     disableMetricsCollection = JsonSerializer.Deserialize<DataFactoryElement<bool>>(property.Value.GetRawText());
                     continue;
                 }
-                additionalPropertiesDictionary.Add(property.Name, BinaryData.FromString(property.Value.GetRawText()));
+                additionalPropertiesDictionary.Add(property.Name, JsonSerializer.Deserialize<DataFactoryElement<string>>(property.Value.GetRawText()));
             }
             additionalProperties = additionalPropertiesDictionary;
             return new FileServerReadSettings(type, maxConcurrentConnections.Value, disableMetricsCollection.Value, additionalProperties, recursive.Value, wildcardFolderPath.Value, wildcardFileName.Value, fileListPath.Value, enablePartitionDiscovery.Value, partitionRootPath.Value, deleteFilesAfterCompletion.Value, modifiedDatetimeStart.Value, modifiedDatetimeEnd.Value, fileFilter.Value);
diff --git a/src/AzureDataFactory.TestingFramework/Generated/Models/FileServerReadSettings.cs b/src/AzureDataFactory.TestingFramework/Generated/Models/FileServerReadSettings.cs
index 5a00ae83..7dcfd7e9 100644
--- a/src/AzureDataFactory.TestingFramework/Generated/Models/FileServerReadSettings.cs
+++ b/src/AzureDataFactory.TestingFramework/Generated/Models/FileServerReadSettings.cs
@@ -33,7 +33,7 @@ public FileServerReadSettings()
         /// <param name="modifiedDatetimeStart"> The start of file's modified datetime. Type: string (or Expression with resultType string). </param>
         /// <param name="modifiedDatetimeEnd"> The end of file's modified datetime. Type: string (or Expression with resultType string). </param>
         /// <param name="fileFilter"> Specify a filter to be used to select a subset of files in the folderPath rather than all files. Type: string (or Expression with resultType string). </param>
-        internal FileServerReadSettings(string storeReadSettingsType, DataFactoryElement<int> maxConcurrentConnections, DataFactoryElement<bool> disableMetricsCollection, IDictionary<string, BinaryData> additionalProperties, DataFactoryElement<bool> recursive, DataFactoryElement<string> wildcardFolderPath, DataFactoryElement<string> wildcardFileName, DataFactoryElement<string> fileListPath, DataFactoryElement<bool> enablePartitionDiscovery, DataFactoryElement<string> partitionRootPath, DataFactoryElement<bool> deleteFilesAfterCompletion, DataFactoryElement<string> modifiedDatetimeStart, DataFactoryElement<string> modifiedDatetimeEnd, DataFactoryElement<string> fileFilter) : base(storeReadSettingsType, maxConcurrentConnections, disableMetricsCollection, additionalProperties)
+        internal FileServerReadSettings(string storeReadSettingsType, DataFactoryElement<int> maxConcurrentConnections, DataFactoryElement<bool> disableMetricsCollection, IDictionary<string, DataFactoryElement<string>> additionalProperties, DataFactoryElement<bool> recursive, DataFactoryElement<string> wildcardFolderPath, DataFactoryElement<string> wildcardFileName, DataFactoryElement<string> fileListPath, DataFactoryElement<bool> enablePartitionDiscovery, DataFactoryElement<string> partitionRootPath, DataFactoryElement<bool> deleteFilesAfterCompletion, DataFactoryElement<string> modifiedDatetimeStart, DataFactoryElement<string> modifiedDatetimeEnd, DataFactoryElement<string> fileFilter) : base(storeReadSettingsType, maxConcurrentConnections, disableMetricsCollection, additionalProperties)
         {
             Recursive = recursive;
             WildcardFolderPath = wildcardFolderPath;
diff --git a/src/AzureDataFactory.TestingFramework/Generated/Models/FileServerWriteSettings.Serialization.cs b/src/AzureDataFactory.TestingFramework/Generated/Models/FileServerWriteSettings.Serialization.cs
index 07a10502..2b90435d 100644
--- a/src/AzureDataFactory.TestingFramework/Generated/Models/FileServerWriteSettings.Serialization.cs
+++ b/src/AzureDataFactory.TestingFramework/Generated/Models/FileServerWriteSettings.Serialization.cs
@@ -59,8 +59,8 @@ internal static FileServerWriteSettings DeserializeFileServerWriteSettings(JsonE
             Optional<DataFactoryElement<int>> maxConcurrentConnections = default;
             Optional<DataFactoryElement<bool>> disableMetricsCollection = default;
             Optional<BinaryData> copyBehavior = default;
-            IDictionary<string, BinaryData> additionalProperties = default;
-            Dictionary<string, BinaryData> additionalPropertiesDictionary = new Dictionary<string, BinaryData>();
+            IDictionary<string, DataFactoryElement<string>> additionalProperties = default;
+            Dictionary<string, DataFactoryElement<string>> additionalPropertiesDictionary = new Dictionary<string, DataFactoryElement<string>>();
             foreach (var property in element.EnumerateObject())
             {
                 if (property.NameEquals("type"u8))
@@ -95,7 +95,7 @@ internal static FileServerWriteSettings DeserializeFileServerWriteSettings(JsonE
                     copyBehavior = BinaryData.FromString(property.Value.GetRawText());
                     continue;
                 }
-                additionalPropertiesDictionary.Add(property.Name, BinaryData.FromString(property.Value.GetRawText()));
+                additionalPropertiesDictionary.Add(property.Name, JsonSerializer.Deserialize<DataFactoryElement<string>>(property.Value.GetRawText()));
             }
             additionalProperties = additionalPropertiesDictionary;
             return new FileServerWriteSettings(type, maxConcurrentConnections.Value, disableMetricsCollection.Value, copyBehavior.Value, additionalProperties);
diff --git a/src/AzureDataFactory.TestingFramework/Generated/Models/FileServerWriteSettings.cs b/src/AzureDataFactory.TestingFramework/Generated/Models/FileServerWriteSettings.cs
index cfeb397f..b0373581 100644
--- a/src/AzureDataFactory.TestingFramework/Generated/Models/FileServerWriteSettings.cs
+++ b/src/AzureDataFactory.TestingFramework/Generated/Models/FileServerWriteSettings.cs
@@ -24,7 +24,7 @@ public FileServerWriteSettings()
         /// <param name="disableMetricsCollection"> If true, disable data store metrics collection. Default is false. Type: boolean (or Expression with resultType boolean). </param>
         /// <param name="copyBehavior"> The type of copy behavior for copy sink. </param>
         /// <param name="additionalProperties"> Additional Properties. </param>
-        internal FileServerWriteSettings(string storeWriteSettingsType, DataFactoryElement<int> maxConcurrentConnections, DataFactoryElement<bool> disableMetricsCollection, BinaryData copyBehavior, IDictionary<string, BinaryData> additionalProperties) : base(storeWriteSettingsType, maxConcurrentConnections, disableMetricsCollection, copyBehavior, additionalProperties)
+        internal FileServerWriteSettings(string storeWriteSettingsType, DataFactoryElement<int> maxConcurrentConnections, DataFactoryElement<bool> disableMetricsCollection, BinaryData copyBehavior, IDictionary<string, DataFactoryElement<string>> additionalProperties) : base(storeWriteSettingsType, maxConcurrentConnections, disableMetricsCollection, copyBehavior, additionalProperties)
         {
             StoreWriteSettingsType = storeWriteSettingsType ?? "FileServerWriteSettings";
         }
diff --git a/src/AzureDataFactory.TestingFramework/Generated/Models/FileShareDataset.Serialization.cs b/src/AzureDataFactory.TestingFramework/Generated/Models/FileShareDataset.Serialization.cs
index ff3b74e2..237035bc 100644
--- a/src/AzureDataFactory.TestingFramework/Generated/Models/FileShareDataset.Serialization.cs
+++ b/src/AzureDataFactory.TestingFramework/Generated/Models/FileShareDataset.Serialization.cs
@@ -140,8 +140,8 @@ internal static FileShareDataset DeserializeFileShareDataset(JsonElement element
             Optional<DatasetStorageFormat> format = default;
             Optional<DataFactoryElement<string>> fileFilter = default;
             Optional<DatasetCompression> compression = default;
-            IDictionary<string, BinaryData> additionalProperties = default;
-            Dictionary<string, BinaryData> additionalPropertiesDictionary = new Dictionary<string, BinaryData>();
+            IDictionary<string, DataFactoryElement<string>> additionalProperties = default;
+            Dictionary<string, DataFactoryElement<string>> additionalPropertiesDictionary = new Dictionary<string, DataFactoryElement<string>>();
             foreach (var property in element.EnumerateObject())
             {
                 if (property.NameEquals("type"u8))
@@ -296,7 +296,7 @@ internal static FileShareDataset DeserializeFileShareDataset(JsonElement element
                     }
                     continue;
                 }
-                additionalPropertiesDictionary.Add(property.Name, BinaryData.FromString(property.Value.GetRawText()));
+                additionalPropertiesDictionary.Add(property.Name, JsonSerializer.Deserialize<DataFactoryElement<string>>(property.Value.GetRawText()));
             }
             additionalProperties = additionalPropertiesDictionary;
             return new FileShareDataset(type, description.Value, structure.Value, schema.Value, linkedServiceName, Optional.ToDictionary(parameters), Optional.ToList(annotations), folder.Value, additionalProperties, folderPath.Value, fileName.Value, modifiedDatetimeStart.Value, modifiedDatetimeEnd.Value, format.Value, fileFilter.Value, compression.Value);
diff --git a/src/AzureDataFactory.TestingFramework/Generated/Models/FileShareDataset.cs b/src/AzureDataFactory.TestingFramework/Generated/Models/FileShareDataset.cs
index 8fbf0b79..30c727a3 100644
--- a/src/AzureDataFactory.TestingFramework/Generated/Models/FileShareDataset.cs
+++ b/src/AzureDataFactory.TestingFramework/Generated/Models/FileShareDataset.cs
@@ -44,7 +44,7 @@ public FileShareDataset(DataFactoryLinkedServiceReference linkedServiceName) : b
         /// </param>
         /// <param name="fileFilter"> Specify a filter to be used to select a subset of files in the folderPath rather than all files. Type: string (or Expression with resultType string). </param>
         /// <param name="compression"> The data compression method used for the file system. </param>
-        internal FileShareDataset(string datasetType, string description, DataFactoryElement<IList<DatasetDataElement>> structure, DataFactoryElement<IList<DatasetSchemaDataElement>> schema, DataFactoryLinkedServiceReference linkedServiceName, IDictionary<string, EntityParameterSpecification> parameters, IList<BinaryData> annotations, DatasetFolder folder, IDictionary<string, BinaryData> additionalProperties, DataFactoryElement<string> folderPath, DataFactoryElement<string> fileName, DataFactoryElement<string> modifiedDatetimeStart, DataFactoryElement<string> modifiedDatetimeEnd, DatasetStorageFormat format, DataFactoryElement<string> fileFilter, DatasetCompression compression) : base(datasetType, description, structure, schema, linkedServiceName, parameters, annotations, folder, additionalProperties)
+        internal FileShareDataset(string datasetType, string description, DataFactoryElement<IList<DatasetDataElement>> structure, DataFactoryElement<IList<DatasetSchemaDataElement>> schema, DataFactoryLinkedServiceReference linkedServiceName, IDictionary<string, EntityParameterSpecification> parameters, IList<BinaryData> annotations, DatasetFolder folder, IDictionary<string, DataFactoryElement<string>> additionalProperties, DataFactoryElement<string> folderPath, DataFactoryElement<string> fileName, DataFactoryElement<string> modifiedDatetimeStart, DataFactoryElement<string> modifiedDatetimeEnd, DatasetStorageFormat format, DataFactoryElement<string> fileFilter, DatasetCompression compression) : base(datasetType, description, structure, schema, linkedServiceName, parameters, annotations, folder, additionalProperties)
         {
             FolderPath = folderPath;
             FileName = fileName;
diff --git a/src/AzureDataFactory.TestingFramework/Generated/Models/FileSystemSink.Serialization.cs b/src/AzureDataFactory.TestingFramework/Generated/Models/FileSystemSink.Serialization.cs
index 354aace7..fd1979d3 100644
--- a/src/AzureDataFactory.TestingFramework/Generated/Models/FileSystemSink.Serialization.cs
+++ b/src/AzureDataFactory.TestingFramework/Generated/Models/FileSystemSink.Serialization.cs
@@ -83,8 +83,8 @@ internal static FileSystemSink DeserializeFileSystemSink(JsonElement element)
             Optional<DataFactoryElement<string>> sinkRetryWait = default;
             Optional<DataFactoryElement<int>> maxConcurrentConnections = default;
             Optional<DataFactoryElement<bool>> disableMetricsCollection = default;
-            IDictionary<string, BinaryData> additionalProperties = default;
-            Dictionary<string, BinaryData> additionalPropertiesDictionary = new Dictionary<string, BinaryData>();
+            IDictionary<string, DataFactoryElement<string>> additionalProperties = default;
+            Dictionary<string, DataFactoryElement<string>> additionalPropertiesDictionary = new Dictionary<string, DataFactoryElement<string>>();
             foreach (var property in element.EnumerateObject())
             {
                 if (property.NameEquals("copyBehavior"u8))
@@ -155,7 +155,7 @@ internal static FileSystemSink DeserializeFileSystemSink(JsonElement element)
                     disableMetricsCollection = JsonSerializer.Deserialize<DataFactoryElement<bool>>(property.Value.GetRawText());
                     continue;
                 }
-                additionalPropertiesDictionary.Add(property.Name, BinaryData.FromString(property.Value.GetRawText()));
+                additionalPropertiesDictionary.Add(property.Name, JsonSerializer.Deserialize<DataFactoryElement<string>>(property.Value.GetRawText()));
             }
             additionalProperties = additionalPropertiesDictionary;
             return new FileSystemSink(type, writeBatchSize.Value, writeBatchTimeout.Value, sinkRetryCount.Value, sinkRetryWait.Value, maxConcurrentConnections.Value, disableMetricsCollection.Value, additionalProperties, copyBehavior.Value);
diff --git a/src/AzureDataFactory.TestingFramework/Generated/Models/FileSystemSink.cs b/src/AzureDataFactory.TestingFramework/Generated/Models/FileSystemSink.cs
index 6886cfd5..ae47971b 100644
--- a/src/AzureDataFactory.TestingFramework/Generated/Models/FileSystemSink.cs
+++ b/src/AzureDataFactory.TestingFramework/Generated/Models/FileSystemSink.cs
@@ -28,7 +28,7 @@ public FileSystemSink()
         /// <param name="disableMetricsCollection"> If true, disable data store metrics collection. Default is false. Type: boolean (or Expression with resultType boolean). </param>
         /// <param name="additionalProperties"> Additional Properties. </param>
         /// <param name="copyBehavior"> The type of copy behavior for copy sink. </param>
-        internal FileSystemSink(string copySinkType, DataFactoryElement<int> writeBatchSize, DataFactoryElement<string> writeBatchTimeout, DataFactoryElement<int> sinkRetryCount, DataFactoryElement<string> sinkRetryWait, DataFactoryElement<int> maxConcurrentConnections, DataFactoryElement<bool> disableMetricsCollection, IDictionary<string, BinaryData> additionalProperties, BinaryData copyBehavior) : base(copySinkType, writeBatchSize, writeBatchTimeout, sinkRetryCount, sinkRetryWait, maxConcurrentConnections, disableMetricsCollection, additionalProperties)
+        internal FileSystemSink(string copySinkType, DataFactoryElement<int> writeBatchSize, DataFactoryElement<string> writeBatchTimeout, DataFactoryElement<int> sinkRetryCount, DataFactoryElement<string> sinkRetryWait, DataFactoryElement<int> maxConcurrentConnections, DataFactoryElement<bool> disableMetricsCollection, IDictionary<string, DataFactoryElement<string>> additionalProperties, BinaryData copyBehavior) : base(copySinkType, writeBatchSize, writeBatchTimeout, sinkRetryCount, sinkRetryWait, maxConcurrentConnections, disableMetricsCollection, additionalProperties)
         {
             CopyBehavior = copyBehavior;
             CopySinkType = copySinkType ?? "FileSystemSink";
diff --git a/src/AzureDataFactory.TestingFramework/Generated/Models/FileSystemSource.Serialization.cs b/src/AzureDataFactory.TestingFramework/Generated/Models/FileSystemSource.Serialization.cs
index e643c48f..880cb92a 100644
--- a/src/AzureDataFactory.TestingFramework/Generated/Models/FileSystemSource.Serialization.cs
+++ b/src/AzureDataFactory.TestingFramework/Generated/Models/FileSystemSource.Serialization.cs
@@ -77,8 +77,8 @@ internal static FileSystemSource DeserializeFileSystemSource(JsonElement element
             Optional<DataFactoryElement<string>> sourceRetryWait = default;
             Optional<DataFactoryElement<int>> maxConcurrentConnections = default;
             Optional<DataFactoryElement<bool>> disableMetricsCollection = default;
-            IDictionary<string, BinaryData> additionalProperties = default;
-            Dictionary<string, BinaryData> additionalPropertiesDictionary = new Dictionary<string, BinaryData>();
+            IDictionary<string, DataFactoryElement<string>> additionalProperties = default;
+            Dictionary<string, DataFactoryElement<string>> additionalPropertiesDictionary = new Dictionary<string, DataFactoryElement<string>>();
             foreach (var property in element.EnumerateObject())
             {
                 if (property.NameEquals("recursive"u8))
@@ -140,7 +140,7 @@ internal static FileSystemSource DeserializeFileSystemSource(JsonElement element
                     disableMetricsCollection = JsonSerializer.Deserialize<DataFactoryElement<bool>>(property.Value.GetRawText());
                     continue;
                 }
-                additionalPropertiesDictionary.Add(property.Name, BinaryData.FromString(property.Value.GetRawText()));
+                additionalPropertiesDictionary.Add(property.Name, JsonSerializer.Deserialize<DataFactoryElement<string>>(property.Value.GetRawText()));
             }
             additionalProperties = additionalPropertiesDictionary;
             return new FileSystemSource(type, sourceRetryCount.Value, sourceRetryWait.Value, maxConcurrentConnections.Value, disableMetricsCollection.Value, additionalProperties, recursive.Value, additionalColumns.Value);
diff --git a/src/AzureDataFactory.TestingFramework/Generated/Models/FileSystemSource.cs b/src/AzureDataFactory.TestingFramework/Generated/Models/FileSystemSource.cs
index 1bed5365..6cbc6d25 100644
--- a/src/AzureDataFactory.TestingFramework/Generated/Models/FileSystemSource.cs
+++ b/src/AzureDataFactory.TestingFramework/Generated/Models/FileSystemSource.cs
@@ -27,7 +27,7 @@ public FileSystemSource()
         /// <param name="additionalProperties"> Additional Properties. </param>
         /// <param name="recursive"> If true, files under the folder path will be read recursively. Default is true. Type: boolean (or Expression with resultType boolean). </param>
         /// <param name="additionalColumns"> Specifies the additional columns to be added to source data. Type: array of objects(AdditionalColumns) (or Expression with resultType array of objects). </param>
-        internal FileSystemSource(string copySourceType, DataFactoryElement<int> sourceRetryCount, DataFactoryElement<string> sourceRetryWait, DataFactoryElement<int> maxConcurrentConnections, DataFactoryElement<bool> disableMetricsCollection, IDictionary<string, BinaryData> additionalProperties, DataFactoryElement<bool> recursive, BinaryData additionalColumns) : base(copySourceType, sourceRetryCount, sourceRetryWait, maxConcurrentConnections, disableMetricsCollection, additionalProperties)
+        internal FileSystemSource(string copySourceType, DataFactoryElement<int> sourceRetryCount, DataFactoryElement<string> sourceRetryWait, DataFactoryElement<int> maxConcurrentConnections, DataFactoryElement<bool> disableMetricsCollection, IDictionary<string, DataFactoryElement<string>> additionalProperties, DataFactoryElement<bool> recursive, BinaryData additionalColumns) : base(copySourceType, sourceRetryCount, sourceRetryWait, maxConcurrentConnections, disableMetricsCollection, additionalProperties)
         {
             Recursive = recursive;
             AdditionalColumns = additionalColumns;
diff --git a/src/AzureDataFactory.TestingFramework/Generated/Models/FilterActivity.Serialization.cs b/src/AzureDataFactory.TestingFramework/Generated/Models/FilterActivity.Serialization.cs
index 788b1c40..97f3ea72 100644
--- a/src/AzureDataFactory.TestingFramework/Generated/Models/FilterActivity.Serialization.cs
+++ b/src/AzureDataFactory.TestingFramework/Generated/Models/FilterActivity.Serialization.cs
@@ -7,6 +7,7 @@
 
 using System.Text.Json;
 using Azure.Core;
+using Azure.Core.Expressions.DataFactory;
 
 namespace AzureDataFactory.TestingFramework.Models
 {
@@ -88,8 +89,8 @@ internal static FilterActivity DeserializeFilterActivity(JsonElement element)
             Optional<IList<PipelineActivityUserProperty>> userProperties = default;
             DataFactoryExpression items = default;
             DataFactoryExpression condition = default;
-            IDictionary<string, BinaryData> additionalProperties = default;
-            Dictionary<string, BinaryData> additionalPropertiesDictionary = new Dictionary<string, BinaryData>();
+            IDictionary<string, DataFactoryElement<string>> additionalProperties = default;
+            Dictionary<string, DataFactoryElement<string>> additionalPropertiesDictionary = new Dictionary<string, DataFactoryElement<string>>();
             foreach (var property in element.EnumerateObject())
             {
                 if (property.NameEquals("name"u8))
@@ -175,7 +176,7 @@ internal static FilterActivity DeserializeFilterActivity(JsonElement element)
                     }
                     continue;
                 }
-                additionalPropertiesDictionary.Add(property.Name, BinaryData.FromString(property.Value.GetRawText()));
+                additionalPropertiesDictionary.Add(property.Name, JsonSerializer.Deserialize<DataFactoryElement<string>>(property.Value.GetRawText()));
             }
             additionalProperties = additionalPropertiesDictionary;
             return new FilterActivity(name, type, description.Value, Optional.ToNullable(state), Optional.ToNullable(onInactiveMarkAs), Optional.ToList(dependsOn), Optional.ToList(userProperties), additionalProperties, items, condition);
diff --git a/src/AzureDataFactory.TestingFramework/Generated/Models/FilterActivity.cs b/src/AzureDataFactory.TestingFramework/Generated/Models/FilterActivity.cs
index 2011a7d0..eca1d901 100644
--- a/src/AzureDataFactory.TestingFramework/Generated/Models/FilterActivity.cs
+++ b/src/AzureDataFactory.TestingFramework/Generated/Models/FilterActivity.cs
@@ -6,6 +6,7 @@
 #nullable disable
 
 using Azure.Core;
+using Azure.Core.Expressions.DataFactory;
 
 namespace AzureDataFactory.TestingFramework.Models
 {
@@ -39,7 +40,7 @@ public FilterActivity(string name, DataFactoryExpression items, DataFactoryExpre
         /// <param name="additionalProperties"> Additional Properties. </param>
         /// <param name="items"> Input array on which filter should be applied. </param>
         /// <param name="condition"> Condition to be used for filtering the input. </param>
-        internal FilterActivity(string name, string activityType, string description, PipelineActivityState? state, ActivityOnInactiveMarkAs? onInactiveMarkAs, IList<PipelineActivityDependency> dependsOn, IList<PipelineActivityUserProperty> userProperties, IDictionary<string, BinaryData> additionalProperties, DataFactoryExpression items, DataFactoryExpression condition) : base(name, activityType, description, state, onInactiveMarkAs, dependsOn, userProperties, additionalProperties)
+        internal FilterActivity(string name, string activityType, string description, PipelineActivityState? state, ActivityOnInactiveMarkAs? onInactiveMarkAs, IList<PipelineActivityDependency> dependsOn, IList<PipelineActivityUserProperty> userProperties, IDictionary<string, DataFactoryElement<string>> additionalProperties, DataFactoryExpression items, DataFactoryExpression condition) : base(name, activityType, description, state, onInactiveMarkAs, dependsOn, userProperties, additionalProperties)
         {
             Items = items;
             Condition = condition;
diff --git a/src/AzureDataFactory.TestingFramework/Generated/Models/ForEachActivity.Serialization.cs b/src/AzureDataFactory.TestingFramework/Generated/Models/ForEachActivity.Serialization.cs
index 90301b5a..24ac18f3 100644
--- a/src/AzureDataFactory.TestingFramework/Generated/Models/ForEachActivity.Serialization.cs
+++ b/src/AzureDataFactory.TestingFramework/Generated/Models/ForEachActivity.Serialization.cs
@@ -7,6 +7,7 @@
 
 using System.Text.Json;
 using Azure.Core;
+using Azure.Core.Expressions.DataFactory;
 
 namespace AzureDataFactory.TestingFramework.Models
 {
@@ -105,8 +106,8 @@ internal static ForEachActivity DeserializeForEachActivity(JsonElement element)
             Optional<int> batchCount = default;
             DataFactoryExpression items = default;
             IList<PipelineActivity> activities = default;
-            IDictionary<string, BinaryData> additionalProperties = default;
-            Dictionary<string, BinaryData> additionalPropertiesDictionary = new Dictionary<string, BinaryData>();
+            IDictionary<string, DataFactoryElement<string>> additionalProperties = default;
+            Dictionary<string, DataFactoryElement<string>> additionalPropertiesDictionary = new Dictionary<string, DataFactoryElement<string>>();
             foreach (var property in element.EnumerateObject())
             {
                 if (property.NameEquals("name"u8))
@@ -215,7 +216,7 @@ internal static ForEachActivity DeserializeForEachActivity(JsonElement element)
                     }
                     continue;
                 }
-                additionalPropertiesDictionary.Add(property.Name, BinaryData.FromString(property.Value.GetRawText()));
+                additionalPropertiesDictionary.Add(property.Name, JsonSerializer.Deserialize<DataFactoryElement<string>>(property.Value.GetRawText()));
             }
             additionalProperties = additionalPropertiesDictionary;
             return new ForEachActivity(name, type, description.Value, Optional.ToNullable(state), Optional.ToNullable(onInactiveMarkAs), Optional.ToList(dependsOn), Optional.ToList(userProperties), additionalProperties, Optional.ToNullable(isSequential), Optional.ToNullable(batchCount), items, activities);
diff --git a/src/AzureDataFactory.TestingFramework/Generated/Models/ForEachActivity.cs b/src/AzureDataFactory.TestingFramework/Generated/Models/ForEachActivity.cs
index baaa5a65..9b0d6707 100644
--- a/src/AzureDataFactory.TestingFramework/Generated/Models/ForEachActivity.cs
+++ b/src/AzureDataFactory.TestingFramework/Generated/Models/ForEachActivity.cs
@@ -6,6 +6,7 @@
 #nullable disable
 
 using Azure.Core;
+using Azure.Core.Expressions.DataFactory;
 
 namespace AzureDataFactory.TestingFramework.Models
 {
@@ -49,7 +50,7 @@ public ForEachActivity(string name, DataFactoryExpression items, IEnumerable<Pip
         /// Please note <see cref="PipelineActivity"/> is the base class. According to the scenario, a derived class of the base class might need to be assigned here, or this property needs to be casted to one of the possible derived classes.
         /// The available derived classes include <see cref="AppendVariableActivity"/>, <see cref="AzureDataExplorerCommandActivity"/>, <see cref="AzureFunctionActivity"/>, <see cref="AzureMLBatchExecutionActivity"/>, <see cref="AzureMLExecutePipelineActivity"/>, <see cref="AzureMLUpdateResourceActivity"/>, <see cref="ControlActivity"/>, <see cref="CopyActivity"/>, <see cref="CustomActivity"/>, <see cref="DataLakeAnalyticsUsqlActivity"/>, <see cref="DatabricksNotebookActivity"/>, <see cref="DatabricksSparkJarActivity"/>, <see cref="DatabricksSparkPythonActivity"/>, <see cref="DeleteActivity"/>, <see cref="ExecuteDataFlowActivity"/>, <see cref="ExecutePipelineActivity"/>, <see cref="ExecuteSsisPackageActivity"/>, <see cref="ExecuteWranglingDataflowActivity"/>, <see cref="ExecutionActivity"/>, <see cref="FailActivity"/>, <see cref="FilterActivity"/>, <see cref="ForEachActivity"/>, <see cref="GetDatasetMetadataActivity"/>, <see cref="HDInsightHiveActivity"/>, <see cref="HDInsightMapReduceActivity"/>, <see cref="HDInsightPigActivity"/>, <see cref="HDInsightSparkActivity"/>, <see cref="HDInsightStreamingActivity"/>, <see cref="IfConditionActivity"/>, <see cref="LookupActivity"/>, <see cref="DataFactoryScriptActivity"/>, <see cref="SetVariableActivity"/>, <see cref="SynapseSparkJobDefinitionActivity"/>, <see cref="SqlServerStoredProcedureActivity"/>, <see cref="SwitchActivity"/>, <see cref="SynapseNotebookActivity"/>, <see cref="UntilActivity"/>, <see cref="ValidationActivity"/>, <see cref="WaitActivity"/>, <see cref="WebActivity"/> and <see cref="WebHookActivity"/>.
         /// </param>
-        internal ForEachActivity(string name, string activityType, string description, PipelineActivityState? state, ActivityOnInactiveMarkAs? onInactiveMarkAs, IList<PipelineActivityDependency> dependsOn, IList<PipelineActivityUserProperty> userProperties, IDictionary<string, BinaryData> additionalProperties, bool? isSequential, int? batchCount, DataFactoryExpression items, IList<PipelineActivity> activities) : base(name, activityType, description, state, onInactiveMarkAs, dependsOn, userProperties, additionalProperties)
+        internal ForEachActivity(string name, string activityType, string description, PipelineActivityState? state, ActivityOnInactiveMarkAs? onInactiveMarkAs, IList<PipelineActivityDependency> dependsOn, IList<PipelineActivityUserProperty> userProperties, IDictionary<string, DataFactoryElement<string>> additionalProperties, bool? isSequential, int? batchCount, DataFactoryExpression items, IList<PipelineActivity> activities) : base(name, activityType, description, state, onInactiveMarkAs, dependsOn, userProperties, additionalProperties)
         {
             IsSequential = isSequential;
             BatchCount = batchCount;
diff --git a/src/AzureDataFactory.TestingFramework/Generated/Models/FormatReadSettings.cs b/src/AzureDataFactory.TestingFramework/Generated/Models/FormatReadSettings.cs
index d0f94acd..c3fa8a47 100644
--- a/src/AzureDataFactory.TestingFramework/Generated/Models/FormatReadSettings.cs
+++ b/src/AzureDataFactory.TestingFramework/Generated/Models/FormatReadSettings.cs
@@ -6,6 +6,7 @@
 #nullable disable
 
 using Azure.Core;
+using Azure.Core.Expressions.DataFactory;
 
 namespace AzureDataFactory.TestingFramework.Models
 {
@@ -19,13 +20,13 @@ public partial class FormatReadSettings
         /// <summary> Initializes a new instance of FormatReadSettings. </summary>
         public FormatReadSettings()
         {
-            AdditionalProperties = new ChangeTrackingDictionary<string, BinaryData>();
+            AdditionalProperties = new ChangeTrackingDictionary<string, DataFactoryElement<string>>();
         }
 
         /// <summary> Initializes a new instance of FormatReadSettings. </summary>
         /// <param name="formatReadSettingsType"> The read setting type. </param>
         /// <param name="additionalProperties"> Additional Properties. </param>
-        internal FormatReadSettings(string formatReadSettingsType, IDictionary<string, BinaryData> additionalProperties)
+        internal FormatReadSettings(string formatReadSettingsType, IDictionary<string, DataFactoryElement<string>> additionalProperties)
         {
             FormatReadSettingsType = formatReadSettingsType;
             AdditionalProperties = additionalProperties;
@@ -63,6 +64,6 @@ internal FormatReadSettings(string formatReadSettingsType, IDictionary<string, B
         /// </list>
         /// </para>
         /// </summary>
-        public IDictionary<string, BinaryData> AdditionalProperties { get; }
+        public IDictionary<string, DataFactoryElement<string>> AdditionalProperties { get; }
     }
 }
diff --git a/src/AzureDataFactory.TestingFramework/Generated/Models/FormatWriteSettings.cs b/src/AzureDataFactory.TestingFramework/Generated/Models/FormatWriteSettings.cs
index a2b50dac..ca24931e 100644
--- a/src/AzureDataFactory.TestingFramework/Generated/Models/FormatWriteSettings.cs
+++ b/src/AzureDataFactory.TestingFramework/Generated/Models/FormatWriteSettings.cs
@@ -6,6 +6,7 @@
 #nullable disable
 
 using Azure.Core;
+using Azure.Core.Expressions.DataFactory;
 
 namespace AzureDataFactory.TestingFramework.Models
 {
@@ -19,13 +20,13 @@ public partial class FormatWriteSettings
         /// <summary> Initializes a new instance of FormatWriteSettings. </summary>
         public FormatWriteSettings()
         {
-            AdditionalProperties = new ChangeTrackingDictionary<string, BinaryData>();
+            AdditionalProperties = new ChangeTrackingDictionary<string, DataFactoryElement<string>>();
         }
 
         /// <summary> Initializes a new instance of FormatWriteSettings. </summary>
         /// <param name="formatWriteSettingsType"> The write setting type. </param>
         /// <param name="additionalProperties"> Additional Properties. </param>
-        internal FormatWriteSettings(string formatWriteSettingsType, IDictionary<string, BinaryData> additionalProperties)
+        internal FormatWriteSettings(string formatWriteSettingsType, IDictionary<string, DataFactoryElement<string>> additionalProperties)
         {
             FormatWriteSettingsType = formatWriteSettingsType;
             AdditionalProperties = additionalProperties;
@@ -63,6 +64,6 @@ internal FormatWriteSettings(string formatWriteSettingsType, IDictionary<string,
         /// </list>
         /// </para>
         /// </summary>
-        public IDictionary<string, BinaryData> AdditionalProperties { get; }
+        public IDictionary<string, DataFactoryElement<string>> AdditionalProperties { get; }
     }
 }
diff --git a/src/AzureDataFactory.TestingFramework/Generated/Models/FtpReadSettings.Serialization.cs b/src/AzureDataFactory.TestingFramework/Generated/Models/FtpReadSettings.Serialization.cs
index 7b7e030b..d6064feb 100644
--- a/src/AzureDataFactory.TestingFramework/Generated/Models/FtpReadSettings.Serialization.cs
+++ b/src/AzureDataFactory.TestingFramework/Generated/Models/FtpReadSettings.Serialization.cs
@@ -103,8 +103,8 @@ internal static FtpReadSettings DeserializeFtpReadSettings(JsonElement element)
             string type = default;
             Optional<DataFactoryElement<int>> maxConcurrentConnections = default;
             Optional<DataFactoryElement<bool>> disableMetricsCollection = default;
-            IDictionary<string, BinaryData> additionalProperties = default;
-            Dictionary<string, BinaryData> additionalPropertiesDictionary = new Dictionary<string, BinaryData>();
+            IDictionary<string, DataFactoryElement<string>> additionalProperties = default;
+            Dictionary<string, DataFactoryElement<string>> additionalPropertiesDictionary = new Dictionary<string, DataFactoryElement<string>>();
             foreach (var property in element.EnumerateObject())
             {
                 if (property.NameEquals("recursive"u8))
@@ -211,7 +211,7 @@ internal static FtpReadSettings DeserializeFtpReadSettings(JsonElement element)
                     disableMetricsCollection = JsonSerializer.Deserialize<DataFactoryElement<bool>>(property.Value.GetRawText());
                     continue;
                 }
-                additionalPropertiesDictionary.Add(property.Name, BinaryData.FromString(property.Value.GetRawText()));
+                additionalPropertiesDictionary.Add(property.Name, JsonSerializer.Deserialize<DataFactoryElement<string>>(property.Value.GetRawText()));
             }
             additionalProperties = additionalPropertiesDictionary;
             return new FtpReadSettings(type, maxConcurrentConnections.Value, disableMetricsCollection.Value, additionalProperties, recursive.Value, wildcardFolderPath.Value, wildcardFileName.Value, enablePartitionDiscovery.Value, partitionRootPath.Value, deleteFilesAfterCompletion.Value, fileListPath.Value, useBinaryTransfer.Value, disableChunking.Value);
diff --git a/src/AzureDataFactory.TestingFramework/Generated/Models/FtpReadSettings.cs b/src/AzureDataFactory.TestingFramework/Generated/Models/FtpReadSettings.cs
index 49fd987d..a24e62a7 100644
--- a/src/AzureDataFactory.TestingFramework/Generated/Models/FtpReadSettings.cs
+++ b/src/AzureDataFactory.TestingFramework/Generated/Models/FtpReadSettings.cs
@@ -32,7 +32,7 @@ public FtpReadSettings()
         /// <param name="fileListPath"> Point to a text file that lists each file (relative path to the path configured in the dataset) that you want to copy. Type: string (or Expression with resultType string). </param>
         /// <param name="useBinaryTransfer"> Specify whether to use binary transfer mode for FTP stores. Type: boolean (or Expression with resultType boolean). </param>
         /// <param name="disableChunking"> If true, disable parallel reading within each file. Default is false. Type: boolean (or Expression with resultType boolean). </param>
-        internal FtpReadSettings(string storeReadSettingsType, DataFactoryElement<int> maxConcurrentConnections, DataFactoryElement<bool> disableMetricsCollection, IDictionary<string, BinaryData> additionalProperties, DataFactoryElement<bool> recursive, DataFactoryElement<string> wildcardFolderPath, DataFactoryElement<string> wildcardFileName, DataFactoryElement<bool> enablePartitionDiscovery, DataFactoryElement<string> partitionRootPath, DataFactoryElement<bool> deleteFilesAfterCompletion, DataFactoryElement<string> fileListPath, DataFactoryElement<bool> useBinaryTransfer, DataFactoryElement<bool> disableChunking) : base(storeReadSettingsType, maxConcurrentConnections, disableMetricsCollection, additionalProperties)
+        internal FtpReadSettings(string storeReadSettingsType, DataFactoryElement<int> maxConcurrentConnections, DataFactoryElement<bool> disableMetricsCollection, IDictionary<string, DataFactoryElement<string>> additionalProperties, DataFactoryElement<bool> recursive, DataFactoryElement<string> wildcardFolderPath, DataFactoryElement<string> wildcardFileName, DataFactoryElement<bool> enablePartitionDiscovery, DataFactoryElement<string> partitionRootPath, DataFactoryElement<bool> deleteFilesAfterCompletion, DataFactoryElement<string> fileListPath, DataFactoryElement<bool> useBinaryTransfer, DataFactoryElement<bool> disableChunking) : base(storeReadSettingsType, maxConcurrentConnections, disableMetricsCollection, additionalProperties)
         {
             Recursive = recursive;
             WildcardFolderPath = wildcardFolderPath;
diff --git a/src/AzureDataFactory.TestingFramework/Generated/Models/FtpServerLinkedService.Serialization.cs b/src/AzureDataFactory.TestingFramework/Generated/Models/FtpServerLinkedService.Serialization.cs
index 11805057..47b25496 100644
--- a/src/AzureDataFactory.TestingFramework/Generated/Models/FtpServerLinkedService.Serialization.cs
+++ b/src/AzureDataFactory.TestingFramework/Generated/Models/FtpServerLinkedService.Serialization.cs
@@ -129,8 +129,8 @@ internal static FtpServerLinkedService DeserializeFtpServerLinkedService(JsonEle
             Optional<string> encryptedCredential = default;
             Optional<DataFactoryElement<bool>> enableSsl = default;
             Optional<DataFactoryElement<bool>> enableServerCertificateValidation = default;
-            IDictionary<string, BinaryData> additionalProperties = default;
-            Dictionary<string, BinaryData> additionalPropertiesDictionary = new Dictionary<string, BinaryData>();
+            IDictionary<string, DataFactoryElement<string>> additionalProperties = default;
+            Dictionary<string, DataFactoryElement<string>> additionalPropertiesDictionary = new Dictionary<string, DataFactoryElement<string>>();
             foreach (var property in element.EnumerateObject())
             {
                 if (property.NameEquals("type"u8))
@@ -263,7 +263,7 @@ internal static FtpServerLinkedService DeserializeFtpServerLinkedService(JsonEle
                     }
                     continue;
                 }
-                additionalPropertiesDictionary.Add(property.Name, BinaryData.FromString(property.Value.GetRawText()));
+                additionalPropertiesDictionary.Add(property.Name, JsonSerializer.Deserialize<DataFactoryElement<string>>(property.Value.GetRawText()));
             }
             additionalProperties = additionalPropertiesDictionary;
             return new FtpServerLinkedService(type, connectVia.Value, description.Value, Optional.ToDictionary(parameters), Optional.ToList(annotations), additionalProperties, host, port.Value, Optional.ToNullable(authenticationType), userName.Value, password, encryptedCredential.Value, enableSsl.Value, enableServerCertificateValidation.Value);
diff --git a/src/AzureDataFactory.TestingFramework/Generated/Models/FtpServerLinkedService.cs b/src/AzureDataFactory.TestingFramework/Generated/Models/FtpServerLinkedService.cs
index e2f30d3f..3afc55f7 100644
--- a/src/AzureDataFactory.TestingFramework/Generated/Models/FtpServerLinkedService.cs
+++ b/src/AzureDataFactory.TestingFramework/Generated/Models/FtpServerLinkedService.cs
@@ -39,7 +39,7 @@ public FtpServerLinkedService(DataFactoryElement<string> host)
         /// <param name="encryptedCredential"> The encrypted credential used for authentication. Credentials are encrypted using the integration runtime credential manager. Type: string. </param>
         /// <param name="enableSsl"> If true, connect to the FTP server over SSL/TLS channel. Default value is true. Type: boolean (or Expression with resultType boolean). </param>
         /// <param name="enableServerCertificateValidation"> If true, validate the FTP server SSL certificate when connect over SSL/TLS channel. Default value is true. Type: boolean (or Expression with resultType boolean). </param>
-        internal FtpServerLinkedService(string linkedServiceType, IntegrationRuntimeReference connectVia, string description, IDictionary<string, EntityParameterSpecification> parameters, IList<BinaryData> annotations, IDictionary<string, BinaryData> additionalProperties, DataFactoryElement<string> host, DataFactoryElement<int> port, FtpAuthenticationType? authenticationType, DataFactoryElement<string> userName, DataFactorySecretBaseDefinition password, string encryptedCredential, DataFactoryElement<bool> enableSsl, DataFactoryElement<bool> enableServerCertificateValidation) : base(linkedServiceType, connectVia, description, parameters, annotations, additionalProperties)
+        internal FtpServerLinkedService(string linkedServiceType, IntegrationRuntimeReference connectVia, string description, IDictionary<string, EntityParameterSpecification> parameters, IList<BinaryData> annotations, IDictionary<string, DataFactoryElement<string>> additionalProperties, DataFactoryElement<string> host, DataFactoryElement<int> port, FtpAuthenticationType? authenticationType, DataFactoryElement<string> userName, DataFactorySecretBaseDefinition password, string encryptedCredential, DataFactoryElement<bool> enableSsl, DataFactoryElement<bool> enableServerCertificateValidation) : base(linkedServiceType, connectVia, description, parameters, annotations, additionalProperties)
         {
             Host = host;
             Port = port;
diff --git a/src/AzureDataFactory.TestingFramework/Generated/Models/FtpServerLocation.Serialization.cs b/src/AzureDataFactory.TestingFramework/Generated/Models/FtpServerLocation.Serialization.cs
index 381ddc35..eedfb637 100644
--- a/src/AzureDataFactory.TestingFramework/Generated/Models/FtpServerLocation.Serialization.cs
+++ b/src/AzureDataFactory.TestingFramework/Generated/Models/FtpServerLocation.Serialization.cs
@@ -49,8 +49,8 @@ internal static FtpServerLocation DeserializeFtpServerLocation(JsonElement eleme
             string type = default;
             Optional<DataFactoryElement<string>> folderPath = default;
             Optional<DataFactoryElement<string>> fileName = default;
-            IDictionary<string, BinaryData> additionalProperties = default;
-            Dictionary<string, BinaryData> additionalPropertiesDictionary = new Dictionary<string, BinaryData>();
+            IDictionary<string, DataFactoryElement<string>> additionalProperties = default;
+            Dictionary<string, DataFactoryElement<string>> additionalPropertiesDictionary = new Dictionary<string, DataFactoryElement<string>>();
             foreach (var property in element.EnumerateObject())
             {
                 if (property.NameEquals("type"u8))
@@ -76,7 +76,7 @@ internal static FtpServerLocation DeserializeFtpServerLocation(JsonElement eleme
                     fileName = JsonSerializer.Deserialize<DataFactoryElement<string>>(property.Value.GetRawText());
                     continue;
                 }
-                additionalPropertiesDictionary.Add(property.Name, BinaryData.FromString(property.Value.GetRawText()));
+                additionalPropertiesDictionary.Add(property.Name, JsonSerializer.Deserialize<DataFactoryElement<string>>(property.Value.GetRawText()));
             }
             additionalProperties = additionalPropertiesDictionary;
             return new FtpServerLocation(type, folderPath.Value, fileName.Value, additionalProperties);
diff --git a/src/AzureDataFactory.TestingFramework/Generated/Models/FtpServerLocation.cs b/src/AzureDataFactory.TestingFramework/Generated/Models/FtpServerLocation.cs
index 82b38bcc..b6113204 100644
--- a/src/AzureDataFactory.TestingFramework/Generated/Models/FtpServerLocation.cs
+++ b/src/AzureDataFactory.TestingFramework/Generated/Models/FtpServerLocation.cs
@@ -23,7 +23,7 @@ public FtpServerLocation()
         /// <param name="folderPath"> Specify the folder path of dataset. Type: string (or Expression with resultType string). </param>
         /// <param name="fileName"> Specify the file name of dataset. Type: string (or Expression with resultType string). </param>
         /// <param name="additionalProperties"> Additional Properties. </param>
-        internal FtpServerLocation(string datasetLocationType, DataFactoryElement<string> folderPath, DataFactoryElement<string> fileName, IDictionary<string, BinaryData> additionalProperties) : base(datasetLocationType, folderPath, fileName, additionalProperties)
+        internal FtpServerLocation(string datasetLocationType, DataFactoryElement<string> folderPath, DataFactoryElement<string> fileName, IDictionary<string, DataFactoryElement<string>> additionalProperties) : base(datasetLocationType, folderPath, fileName, additionalProperties)
         {
             DatasetLocationType = datasetLocationType ?? "FtpServerLocation";
         }
diff --git a/src/AzureDataFactory.TestingFramework/Generated/Models/GetDatasetMetadataActivity.Serialization.cs b/src/AzureDataFactory.TestingFramework/Generated/Models/GetDatasetMetadataActivity.Serialization.cs
index ed095c1c..3fb71b67 100644
--- a/src/AzureDataFactory.TestingFramework/Generated/Models/GetDatasetMetadataActivity.Serialization.cs
+++ b/src/AzureDataFactory.TestingFramework/Generated/Models/GetDatasetMetadataActivity.Serialization.cs
@@ -130,8 +130,8 @@ internal static GetDatasetMetadataActivity DeserializeGetDatasetMetadataActivity
             Optional<IList<BinaryData>> fieldList = default;
             Optional<StoreReadSettings> storeSettings = default;
             Optional<FormatReadSettings> formatSettings = default;
-            IDictionary<string, BinaryData> additionalProperties = default;
-            Dictionary<string, BinaryData> additionalPropertiesDictionary = new Dictionary<string, BinaryData>();
+            IDictionary<string, DataFactoryElement<string>> additionalProperties = default;
+            Dictionary<string, DataFactoryElement<string>> additionalPropertiesDictionary = new Dictionary<string, DataFactoryElement<string>>();
             foreach (var property in element.EnumerateObject())
             {
                 if (property.NameEquals("linkedServiceName"u8))
@@ -269,7 +269,7 @@ internal static GetDatasetMetadataActivity DeserializeGetDatasetMetadataActivity
                     }
                     continue;
                 }
-                additionalPropertiesDictionary.Add(property.Name, BinaryData.FromString(property.Value.GetRawText()));
+                additionalPropertiesDictionary.Add(property.Name, JsonSerializer.Deserialize<DataFactoryElement<string>>(property.Value.GetRawText()));
             }
             additionalProperties = additionalPropertiesDictionary;
             return new GetDatasetMetadataActivity(name, type, description.Value, Optional.ToNullable(state), Optional.ToNullable(onInactiveMarkAs), Optional.ToList(dependsOn), Optional.ToList(userProperties), additionalProperties, linkedServiceName, policy.Value, dataset, Optional.ToList(fieldList), storeSettings.Value, formatSettings.Value);
diff --git a/src/AzureDataFactory.TestingFramework/Generated/Models/GetDatasetMetadataActivity.cs b/src/AzureDataFactory.TestingFramework/Generated/Models/GetDatasetMetadataActivity.cs
index 54bb278f..9053bf05 100644
--- a/src/AzureDataFactory.TestingFramework/Generated/Models/GetDatasetMetadataActivity.cs
+++ b/src/AzureDataFactory.TestingFramework/Generated/Models/GetDatasetMetadataActivity.cs
@@ -50,7 +50,7 @@ public GetDatasetMetadataActivity(string name, DatasetReference dataset) : base(
         /// Please note <see cref="FormatReadSettings"/> is the base class. According to the scenario, a derived class of the base class might need to be assigned here, or this property needs to be casted to one of the possible derived classes.
         /// The available derived classes include <see cref="BinaryReadSettings"/>, <see cref="JsonReadSettings"/>, <see cref="XmlReadSettings"/> and <see cref="DelimitedTextReadSettings"/>.
         /// </param>
-        internal GetDatasetMetadataActivity(string name, string activityType, string description, PipelineActivityState? state, ActivityOnInactiveMarkAs? onInactiveMarkAs, IList<PipelineActivityDependency> dependsOn, IList<PipelineActivityUserProperty> userProperties, IDictionary<string, BinaryData> additionalProperties, DataFactoryLinkedServiceReference linkedServiceName, PipelineActivityPolicy policy, DatasetReference dataset, IList<BinaryData> fieldList, StoreReadSettings storeSettings, FormatReadSettings formatSettings) : base(name, activityType, description, state, onInactiveMarkAs, dependsOn, userProperties, additionalProperties, linkedServiceName, policy)
+        internal GetDatasetMetadataActivity(string name, string activityType, string description, PipelineActivityState? state, ActivityOnInactiveMarkAs? onInactiveMarkAs, IList<PipelineActivityDependency> dependsOn, IList<PipelineActivityUserProperty> userProperties, IDictionary<string, DataFactoryElement<string>> additionalProperties, DataFactoryLinkedServiceReference linkedServiceName, PipelineActivityPolicy policy, DatasetReference dataset, IList<BinaryData> fieldList, StoreReadSettings storeSettings, FormatReadSettings formatSettings) : base(name, activityType, description, state, onInactiveMarkAs, dependsOn, userProperties, additionalProperties, linkedServiceName, policy)
         {
             Dataset = dataset;
             FieldList = fieldList;
diff --git a/src/AzureDataFactory.TestingFramework/Generated/Models/GoogleAdWordsLinkedService.Serialization.cs b/src/AzureDataFactory.TestingFramework/Generated/Models/GoogleAdWordsLinkedService.Serialization.cs
index 245704a2..0ef0a2fe 100644
--- a/src/AzureDataFactory.TestingFramework/Generated/Models/GoogleAdWordsLinkedService.Serialization.cs
+++ b/src/AzureDataFactory.TestingFramework/Generated/Models/GoogleAdWordsLinkedService.Serialization.cs
@@ -160,8 +160,8 @@ internal static GoogleAdWordsLinkedService DeserializeGoogleAdWordsLinkedService
             Optional<DataFactoryElement<string>> trustedCertPath = default;
             Optional<DataFactoryElement<bool>> useSystemTrustStore = default;
             Optional<string> encryptedCredential = default;
-            IDictionary<string, BinaryData> additionalProperties = default;
-            Dictionary<string, BinaryData> additionalPropertiesDictionary = new Dictionary<string, BinaryData>();
+            IDictionary<string, DataFactoryElement<string>> additionalProperties = default;
+            Dictionary<string, DataFactoryElement<string>> additionalPropertiesDictionary = new Dictionary<string, DataFactoryElement<string>>();
             foreach (var property in element.EnumerateObject())
             {
                 if (property.NameEquals("type"u8))
@@ -334,7 +334,7 @@ internal static GoogleAdWordsLinkedService DeserializeGoogleAdWordsLinkedService
                     }
                     continue;
                 }
-                additionalPropertiesDictionary.Add(property.Name, BinaryData.FromString(property.Value.GetRawText()));
+                additionalPropertiesDictionary.Add(property.Name, JsonSerializer.Deserialize<DataFactoryElement<string>>(property.Value.GetRawText()));
             }
             additionalProperties = additionalPropertiesDictionary;
             return new GoogleAdWordsLinkedService(type, connectVia.Value, description.Value, Optional.ToDictionary(parameters), Optional.ToList(annotations), additionalProperties, connectionProperties.Value, clientCustomerId.Value, developerToken, Optional.ToNullable(authenticationType), refreshToken, clientId.Value, clientSecret, email.Value, keyFilePath.Value, trustedCertPath.Value, useSystemTrustStore.Value, encryptedCredential.Value);
diff --git a/src/AzureDataFactory.TestingFramework/Generated/Models/GoogleAdWordsLinkedService.cs b/src/AzureDataFactory.TestingFramework/Generated/Models/GoogleAdWordsLinkedService.cs
index 388286a4..3837de9b 100644
--- a/src/AzureDataFactory.TestingFramework/Generated/Models/GoogleAdWordsLinkedService.cs
+++ b/src/AzureDataFactory.TestingFramework/Generated/Models/GoogleAdWordsLinkedService.cs
@@ -37,7 +37,7 @@ public GoogleAdWordsLinkedService()
         /// <param name="trustedCertPath"> The full path of the .pem file containing trusted CA certificates for verifying the server when connecting over SSL. This property can only be set when using SSL on self-hosted IR. The default value is the cacerts.pem file installed with the IR. Type: string (or Expression with resultType string). </param>
         /// <param name="useSystemTrustStore"> Specifies whether to use a CA certificate from the system trust store or from a specified PEM file. The default value is false. Type: boolean (or Expression with resultType boolean). </param>
         /// <param name="encryptedCredential"> The encrypted credential used for authentication. Credentials are encrypted using the integration runtime credential manager. Type: string. </param>
-        internal GoogleAdWordsLinkedService(string linkedServiceType, IntegrationRuntimeReference connectVia, string description, IDictionary<string, EntityParameterSpecification> parameters, IList<BinaryData> annotations, IDictionary<string, BinaryData> additionalProperties, BinaryData connectionProperties, DataFactoryElement<string> clientCustomerId, DataFactorySecretBaseDefinition developerToken, GoogleAdWordsAuthenticationType? authenticationType, DataFactorySecretBaseDefinition refreshToken, DataFactoryElement<string> clientId, DataFactorySecretBaseDefinition clientSecret, DataFactoryElement<string> email, DataFactoryElement<string> keyFilePath, DataFactoryElement<string> trustedCertPath, DataFactoryElement<bool> useSystemTrustStore, string encryptedCredential) : base(linkedServiceType, connectVia, description, parameters, annotations, additionalProperties)
+        internal GoogleAdWordsLinkedService(string linkedServiceType, IntegrationRuntimeReference connectVia, string description, IDictionary<string, EntityParameterSpecification> parameters, IList<BinaryData> annotations, IDictionary<string, DataFactoryElement<string>> additionalProperties, BinaryData connectionProperties, DataFactoryElement<string> clientCustomerId, DataFactorySecretBaseDefinition developerToken, GoogleAdWordsAuthenticationType? authenticationType, DataFactorySecretBaseDefinition refreshToken, DataFactoryElement<string> clientId, DataFactorySecretBaseDefinition clientSecret, DataFactoryElement<string> email, DataFactoryElement<string> keyFilePath, DataFactoryElement<string> trustedCertPath, DataFactoryElement<bool> useSystemTrustStore, string encryptedCredential) : base(linkedServiceType, connectVia, description, parameters, annotations, additionalProperties)
         {
             ConnectionProperties = connectionProperties;
             ClientCustomerId = clientCustomerId;
diff --git a/src/AzureDataFactory.TestingFramework/Generated/Models/GoogleAdWordsObjectDataset.Serialization.cs b/src/AzureDataFactory.TestingFramework/Generated/Models/GoogleAdWordsObjectDataset.Serialization.cs
index 34208244..b710f074 100644
--- a/src/AzureDataFactory.TestingFramework/Generated/Models/GoogleAdWordsObjectDataset.Serialization.cs
+++ b/src/AzureDataFactory.TestingFramework/Generated/Models/GoogleAdWordsObjectDataset.Serialization.cs
@@ -104,8 +104,8 @@ internal static GoogleAdWordsObjectDataset DeserializeGoogleAdWordsObjectDataset
             Optional<IList<BinaryData>> annotations = default;
             Optional<DatasetFolder> folder = default;
             Optional<DataFactoryElement<string>> tableName = default;
-            IDictionary<string, BinaryData> additionalProperties = default;
-            Dictionary<string, BinaryData> additionalPropertiesDictionary = new Dictionary<string, BinaryData>();
+            IDictionary<string, DataFactoryElement<string>> additionalProperties = default;
+            Dictionary<string, DataFactoryElement<string>> additionalPropertiesDictionary = new Dictionary<string, DataFactoryElement<string>>();
             foreach (var property in element.EnumerateObject())
             {
                 if (property.NameEquals("type"u8))
@@ -206,7 +206,7 @@ internal static GoogleAdWordsObjectDataset DeserializeGoogleAdWordsObjectDataset
                     }
                     continue;
                 }
-                additionalPropertiesDictionary.Add(property.Name, BinaryData.FromString(property.Value.GetRawText()));
+                additionalPropertiesDictionary.Add(property.Name, JsonSerializer.Deserialize<DataFactoryElement<string>>(property.Value.GetRawText()));
             }
             additionalProperties = additionalPropertiesDictionary;
             return new GoogleAdWordsObjectDataset(type, description.Value, structure.Value, schema.Value, linkedServiceName, Optional.ToDictionary(parameters), Optional.ToList(annotations), folder.Value, additionalProperties, tableName.Value);
diff --git a/src/AzureDataFactory.TestingFramework/Generated/Models/GoogleAdWordsObjectDataset.cs b/src/AzureDataFactory.TestingFramework/Generated/Models/GoogleAdWordsObjectDataset.cs
index e06c40dc..61ab6a16 100644
--- a/src/AzureDataFactory.TestingFramework/Generated/Models/GoogleAdWordsObjectDataset.cs
+++ b/src/AzureDataFactory.TestingFramework/Generated/Models/GoogleAdWordsObjectDataset.cs
@@ -34,7 +34,7 @@ public GoogleAdWordsObjectDataset(DataFactoryLinkedServiceReference linkedServic
         /// <param name="folder"> The folder that this Dataset is in. If not specified, Dataset will appear at the root level. </param>
         /// <param name="additionalProperties"> Additional Properties. </param>
         /// <param name="tableName"> The table name. Type: string (or Expression with resultType string). </param>
-        internal GoogleAdWordsObjectDataset(string datasetType, string description, DataFactoryElement<IList<DatasetDataElement>> structure, DataFactoryElement<IList<DatasetSchemaDataElement>> schema, DataFactoryLinkedServiceReference linkedServiceName, IDictionary<string, EntityParameterSpecification> parameters, IList<BinaryData> annotations, DatasetFolder folder, IDictionary<string, BinaryData> additionalProperties, DataFactoryElement<string> tableName) : base(datasetType, description, structure, schema, linkedServiceName, parameters, annotations, folder, additionalProperties)
+        internal GoogleAdWordsObjectDataset(string datasetType, string description, DataFactoryElement<IList<DatasetDataElement>> structure, DataFactoryElement<IList<DatasetSchemaDataElement>> schema, DataFactoryLinkedServiceReference linkedServiceName, IDictionary<string, EntityParameterSpecification> parameters, IList<BinaryData> annotations, DatasetFolder folder, IDictionary<string, DataFactoryElement<string>> additionalProperties, DataFactoryElement<string> tableName) : base(datasetType, description, structure, schema, linkedServiceName, parameters, annotations, folder, additionalProperties)
         {
             TableName = tableName;
             DatasetType = datasetType ?? "GoogleAdWordsObject";
diff --git a/src/AzureDataFactory.TestingFramework/Generated/Models/GoogleAdWordsSource.Serialization.cs b/src/AzureDataFactory.TestingFramework/Generated/Models/GoogleAdWordsSource.Serialization.cs
index c12b1717..babda90d 100644
--- a/src/AzureDataFactory.TestingFramework/Generated/Models/GoogleAdWordsSource.Serialization.cs
+++ b/src/AzureDataFactory.TestingFramework/Generated/Models/GoogleAdWordsSource.Serialization.cs
@@ -83,8 +83,8 @@ internal static GoogleAdWordsSource DeserializeGoogleAdWordsSource(JsonElement e
             Optional<DataFactoryElement<string>> sourceRetryWait = default;
             Optional<DataFactoryElement<int>> maxConcurrentConnections = default;
             Optional<DataFactoryElement<bool>> disableMetricsCollection = default;
-            IDictionary<string, BinaryData> additionalProperties = default;
-            Dictionary<string, BinaryData> additionalPropertiesDictionary = new Dictionary<string, BinaryData>();
+            IDictionary<string, DataFactoryElement<string>> additionalProperties = default;
+            Dictionary<string, DataFactoryElement<string>> additionalPropertiesDictionary = new Dictionary<string, DataFactoryElement<string>>();
             foreach (var property in element.EnumerateObject())
             {
                 if (property.NameEquals("query"u8))
@@ -155,7 +155,7 @@ internal static GoogleAdWordsSource DeserializeGoogleAdWordsSource(JsonElement e
                     disableMetricsCollection = JsonSerializer.Deserialize<DataFactoryElement<bool>>(property.Value.GetRawText());
                     continue;
                 }
-                additionalPropertiesDictionary.Add(property.Name, BinaryData.FromString(property.Value.GetRawText()));
+                additionalPropertiesDictionary.Add(property.Name, JsonSerializer.Deserialize<DataFactoryElement<string>>(property.Value.GetRawText()));
             }
             additionalProperties = additionalPropertiesDictionary;
             return new GoogleAdWordsSource(type, sourceRetryCount.Value, sourceRetryWait.Value, maxConcurrentConnections.Value, disableMetricsCollection.Value, additionalProperties, queryTimeout.Value, additionalColumns.Value, query.Value);
diff --git a/src/AzureDataFactory.TestingFramework/Generated/Models/GoogleAdWordsSource.cs b/src/AzureDataFactory.TestingFramework/Generated/Models/GoogleAdWordsSource.cs
index a19f22f0..c8c925e5 100644
--- a/src/AzureDataFactory.TestingFramework/Generated/Models/GoogleAdWordsSource.cs
+++ b/src/AzureDataFactory.TestingFramework/Generated/Models/GoogleAdWordsSource.cs
@@ -28,7 +28,7 @@ public GoogleAdWordsSource()
         /// <param name="queryTimeout"> Query timeout. Type: string (or Expression with resultType string), pattern: ((\d+)\.)?(\d\d):(60|([0-5][0-9])):(60|([0-5][0-9])). </param>
         /// <param name="additionalColumns"> Specifies the additional columns to be added to source data. Type: array of objects(AdditionalColumns) (or Expression with resultType array of objects). </param>
         /// <param name="query"> A query to retrieve data from source. Type: string (or Expression with resultType string). </param>
-        internal GoogleAdWordsSource(string copySourceType, DataFactoryElement<int> sourceRetryCount, DataFactoryElement<string> sourceRetryWait, DataFactoryElement<int> maxConcurrentConnections, DataFactoryElement<bool> disableMetricsCollection, IDictionary<string, BinaryData> additionalProperties, DataFactoryElement<string> queryTimeout, BinaryData additionalColumns, DataFactoryElement<string> query) : base(copySourceType, sourceRetryCount, sourceRetryWait, maxConcurrentConnections, disableMetricsCollection, additionalProperties, queryTimeout, additionalColumns)
+        internal GoogleAdWordsSource(string copySourceType, DataFactoryElement<int> sourceRetryCount, DataFactoryElement<string> sourceRetryWait, DataFactoryElement<int> maxConcurrentConnections, DataFactoryElement<bool> disableMetricsCollection, IDictionary<string, DataFactoryElement<string>> additionalProperties, DataFactoryElement<string> queryTimeout, BinaryData additionalColumns, DataFactoryElement<string> query) : base(copySourceType, sourceRetryCount, sourceRetryWait, maxConcurrentConnections, disableMetricsCollection, additionalProperties, queryTimeout, additionalColumns)
         {
             Query = query;
             CopySourceType = copySourceType ?? "GoogleAdWordsSource";
diff --git a/src/AzureDataFactory.TestingFramework/Generated/Models/GoogleBigQueryLinkedService.Serialization.cs b/src/AzureDataFactory.TestingFramework/Generated/Models/GoogleBigQueryLinkedService.Serialization.cs
index e4a22e34..c8ffe631 100644
--- a/src/AzureDataFactory.TestingFramework/Generated/Models/GoogleBigQueryLinkedService.Serialization.cs
+++ b/src/AzureDataFactory.TestingFramework/Generated/Models/GoogleBigQueryLinkedService.Serialization.cs
@@ -150,8 +150,8 @@ internal static GoogleBigQueryLinkedService DeserializeGoogleBigQueryLinkedServi
             Optional<DataFactoryElement<string>> trustedCertPath = default;
             Optional<DataFactoryElement<bool>> useSystemTrustStore = default;
             Optional<string> encryptedCredential = default;
-            IDictionary<string, BinaryData> additionalProperties = default;
-            Dictionary<string, BinaryData> additionalPropertiesDictionary = new Dictionary<string, BinaryData>();
+            IDictionary<string, DataFactoryElement<string>> additionalProperties = default;
+            Dictionary<string, DataFactoryElement<string>> additionalPropertiesDictionary = new Dictionary<string, DataFactoryElement<string>>();
             foreach (var property in element.EnumerateObject())
             {
                 if (property.NameEquals("type"u8))
@@ -316,7 +316,7 @@ internal static GoogleBigQueryLinkedService DeserializeGoogleBigQueryLinkedServi
                     }
                     continue;
                 }
-                additionalPropertiesDictionary.Add(property.Name, BinaryData.FromString(property.Value.GetRawText()));
+                additionalPropertiesDictionary.Add(property.Name, JsonSerializer.Deserialize<DataFactoryElement<string>>(property.Value.GetRawText()));
             }
             additionalProperties = additionalPropertiesDictionary;
             return new GoogleBigQueryLinkedService(type, connectVia.Value, description.Value, Optional.ToDictionary(parameters), Optional.ToList(annotations), additionalProperties, project, additionalProjects.Value, requestGoogleDriveScope.Value, authenticationType, refreshToken, clientId.Value, clientSecret, email.Value, keyFilePath.Value, trustedCertPath.Value, useSystemTrustStore.Value, encryptedCredential.Value);
diff --git a/src/AzureDataFactory.TestingFramework/Generated/Models/GoogleBigQueryLinkedService.cs b/src/AzureDataFactory.TestingFramework/Generated/Models/GoogleBigQueryLinkedService.cs
index 6737a9e1..94cda885 100644
--- a/src/AzureDataFactory.TestingFramework/Generated/Models/GoogleBigQueryLinkedService.cs
+++ b/src/AzureDataFactory.TestingFramework/Generated/Models/GoogleBigQueryLinkedService.cs
@@ -45,7 +45,7 @@ public GoogleBigQueryLinkedService(DataFactoryElement<string> project, GoogleBig
         /// <param name="trustedCertPath"> The full path of the .pem file containing trusted CA certificates for verifying the server when connecting over SSL. This property can only be set when using SSL on self-hosted IR. The default value is the cacerts.pem file installed with the IR. Type: string (or Expression with resultType string). </param>
         /// <param name="useSystemTrustStore"> Specifies whether to use a CA certificate from the system trust store or from a specified PEM file. The default value is false.Type: boolean (or Expression with resultType boolean). </param>
         /// <param name="encryptedCredential"> The encrypted credential used for authentication. Credentials are encrypted using the integration runtime credential manager. Type: string. </param>
-        internal GoogleBigQueryLinkedService(string linkedServiceType, IntegrationRuntimeReference connectVia, string description, IDictionary<string, EntityParameterSpecification> parameters, IList<BinaryData> annotations, IDictionary<string, BinaryData> additionalProperties, DataFactoryElement<string> project, DataFactoryElement<string> additionalProjects, DataFactoryElement<string> requestGoogleDriveScope, GoogleBigQueryAuthenticationType authenticationType, DataFactorySecretBaseDefinition refreshToken, DataFactoryElement<string> clientId, DataFactorySecretBaseDefinition clientSecret, DataFactoryElement<string> email, DataFactoryElement<string> keyFilePath, DataFactoryElement<string> trustedCertPath, DataFactoryElement<bool> useSystemTrustStore, string encryptedCredential) : base(linkedServiceType, connectVia, description, parameters, annotations, additionalProperties)
+        internal GoogleBigQueryLinkedService(string linkedServiceType, IntegrationRuntimeReference connectVia, string description, IDictionary<string, EntityParameterSpecification> parameters, IList<BinaryData> annotations, IDictionary<string, DataFactoryElement<string>> additionalProperties, DataFactoryElement<string> project, DataFactoryElement<string> additionalProjects, DataFactoryElement<string> requestGoogleDriveScope, GoogleBigQueryAuthenticationType authenticationType, DataFactorySecretBaseDefinition refreshToken, DataFactoryElement<string> clientId, DataFactorySecretBaseDefinition clientSecret, DataFactoryElement<string> email, DataFactoryElement<string> keyFilePath, DataFactoryElement<string> trustedCertPath, DataFactoryElement<bool> useSystemTrustStore, string encryptedCredential) : base(linkedServiceType, connectVia, description, parameters, annotations, additionalProperties)
         {
             Project = project;
             AdditionalProjects = additionalProjects;
diff --git a/src/AzureDataFactory.TestingFramework/Generated/Models/GoogleBigQueryObjectDataset.Serialization.cs b/src/AzureDataFactory.TestingFramework/Generated/Models/GoogleBigQueryObjectDataset.Serialization.cs
index 362a83ea..a41d6cf3 100644
--- a/src/AzureDataFactory.TestingFramework/Generated/Models/GoogleBigQueryObjectDataset.Serialization.cs
+++ b/src/AzureDataFactory.TestingFramework/Generated/Models/GoogleBigQueryObjectDataset.Serialization.cs
@@ -120,8 +120,8 @@ internal static GoogleBigQueryObjectDataset DeserializeGoogleBigQueryObjectDatas
             Optional<BinaryData> tableName = default;
             Optional<DataFactoryElement<string>> table = default;
             Optional<DataFactoryElement<string>> dataset = default;
-            IDictionary<string, BinaryData> additionalProperties = default;
-            Dictionary<string, BinaryData> additionalPropertiesDictionary = new Dictionary<string, BinaryData>();
+            IDictionary<string, DataFactoryElement<string>> additionalProperties = default;
+            Dictionary<string, DataFactoryElement<string>> additionalPropertiesDictionary = new Dictionary<string, DataFactoryElement<string>>();
             foreach (var property in element.EnumerateObject())
             {
                 if (property.NameEquals("type"u8))
@@ -240,7 +240,7 @@ internal static GoogleBigQueryObjectDataset DeserializeGoogleBigQueryObjectDatas
                     }
                     continue;
                 }
-                additionalPropertiesDictionary.Add(property.Name, BinaryData.FromString(property.Value.GetRawText()));
+                additionalPropertiesDictionary.Add(property.Name, JsonSerializer.Deserialize<DataFactoryElement<string>>(property.Value.GetRawText()));
             }
             additionalProperties = additionalPropertiesDictionary;
             return new GoogleBigQueryObjectDataset(type, description.Value, structure.Value, schema.Value, linkedServiceName, Optional.ToDictionary(parameters), Optional.ToList(annotations), folder.Value, additionalProperties, tableName.Value, table.Value, dataset.Value);
diff --git a/src/AzureDataFactory.TestingFramework/Generated/Models/GoogleBigQueryObjectDataset.cs b/src/AzureDataFactory.TestingFramework/Generated/Models/GoogleBigQueryObjectDataset.cs
index 570fd208..6dddb8e4 100644
--- a/src/AzureDataFactory.TestingFramework/Generated/Models/GoogleBigQueryObjectDataset.cs
+++ b/src/AzureDataFactory.TestingFramework/Generated/Models/GoogleBigQueryObjectDataset.cs
@@ -36,7 +36,7 @@ public GoogleBigQueryObjectDataset(DataFactoryLinkedServiceReference linkedServi
         /// <param name="tableName"> This property will be retired. Please consider using database + table properties instead. </param>
         /// <param name="table"> The table name of the Google BigQuery. Type: string (or Expression with resultType string). </param>
         /// <param name="dataset"> The database name of the Google BigQuery. Type: string (or Expression with resultType string). </param>
-        internal GoogleBigQueryObjectDataset(string datasetType, string description, DataFactoryElement<IList<DatasetDataElement>> structure, DataFactoryElement<IList<DatasetSchemaDataElement>> schema, DataFactoryLinkedServiceReference linkedServiceName, IDictionary<string, EntityParameterSpecification> parameters, IList<BinaryData> annotations, DatasetFolder folder, IDictionary<string, BinaryData> additionalProperties, BinaryData tableName, DataFactoryElement<string> table, DataFactoryElement<string> dataset) : base(datasetType, description, structure, schema, linkedServiceName, parameters, annotations, folder, additionalProperties)
+        internal GoogleBigQueryObjectDataset(string datasetType, string description, DataFactoryElement<IList<DatasetDataElement>> structure, DataFactoryElement<IList<DatasetSchemaDataElement>> schema, DataFactoryLinkedServiceReference linkedServiceName, IDictionary<string, EntityParameterSpecification> parameters, IList<BinaryData> annotations, DatasetFolder folder, IDictionary<string, DataFactoryElement<string>> additionalProperties, BinaryData tableName, DataFactoryElement<string> table, DataFactoryElement<string> dataset) : base(datasetType, description, structure, schema, linkedServiceName, parameters, annotations, folder, additionalProperties)
         {
             TableName = tableName;
             Table = table;
diff --git a/src/AzureDataFactory.TestingFramework/Generated/Models/GoogleBigQuerySource.Serialization.cs b/src/AzureDataFactory.TestingFramework/Generated/Models/GoogleBigQuerySource.Serialization.cs
index c3ed37b4..38c67467 100644
--- a/src/AzureDataFactory.TestingFramework/Generated/Models/GoogleBigQuerySource.Serialization.cs
+++ b/src/AzureDataFactory.TestingFramework/Generated/Models/GoogleBigQuerySource.Serialization.cs
@@ -83,8 +83,8 @@ internal static GoogleBigQuerySource DeserializeGoogleBigQuerySource(JsonElement
             Optional<DataFactoryElement<string>> sourceRetryWait = default;
             Optional<DataFactoryElement<int>> maxConcurrentConnections = default;
             Optional<DataFactoryElement<bool>> disableMetricsCollection = default;
-            IDictionary<string, BinaryData> additionalProperties = default;
-            Dictionary<string, BinaryData> additionalPropertiesDictionary = new Dictionary<string, BinaryData>();
+            IDictionary<string, DataFactoryElement<string>> additionalProperties = default;
+            Dictionary<string, DataFactoryElement<string>> additionalPropertiesDictionary = new Dictionary<string, DataFactoryElement<string>>();
             foreach (var property in element.EnumerateObject())
             {
                 if (property.NameEquals("query"u8))
@@ -155,7 +155,7 @@ internal static GoogleBigQuerySource DeserializeGoogleBigQuerySource(JsonElement
                     disableMetricsCollection = JsonSerializer.Deserialize<DataFactoryElement<bool>>(property.Value.GetRawText());
                     continue;
                 }
-                additionalPropertiesDictionary.Add(property.Name, BinaryData.FromString(property.Value.GetRawText()));
+                additionalPropertiesDictionary.Add(property.Name, JsonSerializer.Deserialize<DataFactoryElement<string>>(property.Value.GetRawText()));
             }
             additionalProperties = additionalPropertiesDictionary;
             return new GoogleBigQuerySource(type, sourceRetryCount.Value, sourceRetryWait.Value, maxConcurrentConnections.Value, disableMetricsCollection.Value, additionalProperties, queryTimeout.Value, additionalColumns.Value, query.Value);
diff --git a/src/AzureDataFactory.TestingFramework/Generated/Models/GoogleBigQuerySource.cs b/src/AzureDataFactory.TestingFramework/Generated/Models/GoogleBigQuerySource.cs
index 89edbcf3..a2994f6b 100644
--- a/src/AzureDataFactory.TestingFramework/Generated/Models/GoogleBigQuerySource.cs
+++ b/src/AzureDataFactory.TestingFramework/Generated/Models/GoogleBigQuerySource.cs
@@ -28,7 +28,7 @@ public GoogleBigQuerySource()
         /// <param name="queryTimeout"> Query timeout. Type: string (or Expression with resultType string), pattern: ((\d+)\.)?(\d\d):(60|([0-5][0-9])):(60|([0-5][0-9])). </param>
         /// <param name="additionalColumns"> Specifies the additional columns to be added to source data. Type: array of objects(AdditionalColumns) (or Expression with resultType array of objects). </param>
         /// <param name="query"> A query to retrieve data from source. Type: string (or Expression with resultType string). </param>
-        internal GoogleBigQuerySource(string copySourceType, DataFactoryElement<int> sourceRetryCount, DataFactoryElement<string> sourceRetryWait, DataFactoryElement<int> maxConcurrentConnections, DataFactoryElement<bool> disableMetricsCollection, IDictionary<string, BinaryData> additionalProperties, DataFactoryElement<string> queryTimeout, BinaryData additionalColumns, DataFactoryElement<string> query) : base(copySourceType, sourceRetryCount, sourceRetryWait, maxConcurrentConnections, disableMetricsCollection, additionalProperties, queryTimeout, additionalColumns)
+        internal GoogleBigQuerySource(string copySourceType, DataFactoryElement<int> sourceRetryCount, DataFactoryElement<string> sourceRetryWait, DataFactoryElement<int> maxConcurrentConnections, DataFactoryElement<bool> disableMetricsCollection, IDictionary<string, DataFactoryElement<string>> additionalProperties, DataFactoryElement<string> queryTimeout, BinaryData additionalColumns, DataFactoryElement<string> query) : base(copySourceType, sourceRetryCount, sourceRetryWait, maxConcurrentConnections, disableMetricsCollection, additionalProperties, queryTimeout, additionalColumns)
         {
             Query = query;
             CopySourceType = copySourceType ?? "GoogleBigQuerySource";
diff --git a/src/AzureDataFactory.TestingFramework/Generated/Models/GoogleCloudStorageLinkedService.Serialization.cs b/src/AzureDataFactory.TestingFramework/Generated/Models/GoogleCloudStorageLinkedService.Serialization.cs
index eb88deee..c16581bc 100644
--- a/src/AzureDataFactory.TestingFramework/Generated/Models/GoogleCloudStorageLinkedService.Serialization.cs
+++ b/src/AzureDataFactory.TestingFramework/Generated/Models/GoogleCloudStorageLinkedService.Serialization.cs
@@ -108,8 +108,8 @@ internal static GoogleCloudStorageLinkedService DeserializeGoogleCloudStorageLin
             Optional<DataFactorySecretBaseDefinition> secretAccessKey = default;
             Optional<DataFactoryElement<string>> serviceUrl = default;
             Optional<string> encryptedCredential = default;
-            IDictionary<string, BinaryData> additionalProperties = default;
-            Dictionary<string, BinaryData> additionalPropertiesDictionary = new Dictionary<string, BinaryData>();
+            IDictionary<string, DataFactoryElement<string>> additionalProperties = default;
+            Dictionary<string, DataFactoryElement<string>> additionalPropertiesDictionary = new Dictionary<string, DataFactoryElement<string>>();
             foreach (var property in element.EnumerateObject())
             {
                 if (property.NameEquals("type"u8))
@@ -210,7 +210,7 @@ internal static GoogleCloudStorageLinkedService DeserializeGoogleCloudStorageLin
                     }
                     continue;
                 }
-                additionalPropertiesDictionary.Add(property.Name, BinaryData.FromString(property.Value.GetRawText()));
+                additionalPropertiesDictionary.Add(property.Name, JsonSerializer.Deserialize<DataFactoryElement<string>>(property.Value.GetRawText()));
             }
             additionalProperties = additionalPropertiesDictionary;
             return new GoogleCloudStorageLinkedService(type, connectVia.Value, description.Value, Optional.ToDictionary(parameters), Optional.ToList(annotations), additionalProperties, accessKeyId.Value, secretAccessKey, serviceUrl.Value, encryptedCredential.Value);
diff --git a/src/AzureDataFactory.TestingFramework/Generated/Models/GoogleCloudStorageLinkedService.cs b/src/AzureDataFactory.TestingFramework/Generated/Models/GoogleCloudStorageLinkedService.cs
index 08ca12b7..ae2d2f64 100644
--- a/src/AzureDataFactory.TestingFramework/Generated/Models/GoogleCloudStorageLinkedService.cs
+++ b/src/AzureDataFactory.TestingFramework/Generated/Models/GoogleCloudStorageLinkedService.cs
@@ -29,7 +29,7 @@ public GoogleCloudStorageLinkedService()
         /// <param name="secretAccessKey"> The secret access key of the Google Cloud Storage Identity and Access Management (IAM) user. </param>
         /// <param name="serviceUri"> This value specifies the endpoint to access with the Google Cloud Storage Connector. This is an optional property; change it only if you want to try a different service endpoint or want to switch between https and http. Type: string (or Expression with resultType string). </param>
         /// <param name="encryptedCredential"> The encrypted credential used for authentication. Credentials are encrypted using the integration runtime credential manager. Type: string. </param>
-        internal GoogleCloudStorageLinkedService(string linkedServiceType, IntegrationRuntimeReference connectVia, string description, IDictionary<string, EntityParameterSpecification> parameters, IList<BinaryData> annotations, IDictionary<string, BinaryData> additionalProperties, DataFactoryElement<string> accessKeyId, DataFactorySecretBaseDefinition secretAccessKey, DataFactoryElement<string> serviceUri, string encryptedCredential) : base(linkedServiceType, connectVia, description, parameters, annotations, additionalProperties)
+        internal GoogleCloudStorageLinkedService(string linkedServiceType, IntegrationRuntimeReference connectVia, string description, IDictionary<string, EntityParameterSpecification> parameters, IList<BinaryData> annotations, IDictionary<string, DataFactoryElement<string>> additionalProperties, DataFactoryElement<string> accessKeyId, DataFactorySecretBaseDefinition secretAccessKey, DataFactoryElement<string> serviceUri, string encryptedCredential) : base(linkedServiceType, connectVia, description, parameters, annotations, additionalProperties)
         {
             AccessKeyId = accessKeyId;
             SecretAccessKey = secretAccessKey;
diff --git a/src/AzureDataFactory.TestingFramework/Generated/Models/GoogleCloudStorageLocation.Serialization.cs b/src/AzureDataFactory.TestingFramework/Generated/Models/GoogleCloudStorageLocation.Serialization.cs
index a8e2098b..2386850a 100644
--- a/src/AzureDataFactory.TestingFramework/Generated/Models/GoogleCloudStorageLocation.Serialization.cs
+++ b/src/AzureDataFactory.TestingFramework/Generated/Models/GoogleCloudStorageLocation.Serialization.cs
@@ -61,8 +61,8 @@ internal static GoogleCloudStorageLocation DeserializeGoogleCloudStorageLocation
             string type = default;
             Optional<DataFactoryElement<string>> folderPath = default;
             Optional<DataFactoryElement<string>> fileName = default;
-            IDictionary<string, BinaryData> additionalProperties = default;
-            Dictionary<string, BinaryData> additionalPropertiesDictionary = new Dictionary<string, BinaryData>();
+            IDictionary<string, DataFactoryElement<string>> additionalProperties = default;
+            Dictionary<string, DataFactoryElement<string>> additionalPropertiesDictionary = new Dictionary<string, DataFactoryElement<string>>();
             foreach (var property in element.EnumerateObject())
             {
                 if (property.NameEquals("bucketName"u8))
@@ -106,7 +106,7 @@ internal static GoogleCloudStorageLocation DeserializeGoogleCloudStorageLocation
                     fileName = JsonSerializer.Deserialize<DataFactoryElement<string>>(property.Value.GetRawText());
                     continue;
                 }
-                additionalPropertiesDictionary.Add(property.Name, BinaryData.FromString(property.Value.GetRawText()));
+                additionalPropertiesDictionary.Add(property.Name, JsonSerializer.Deserialize<DataFactoryElement<string>>(property.Value.GetRawText()));
             }
             additionalProperties = additionalPropertiesDictionary;
             return new GoogleCloudStorageLocation(type, folderPath.Value, fileName.Value, additionalProperties, bucketName.Value, version.Value);
diff --git a/src/AzureDataFactory.TestingFramework/Generated/Models/GoogleCloudStorageLocation.cs b/src/AzureDataFactory.TestingFramework/Generated/Models/GoogleCloudStorageLocation.cs
index d7d900dd..4357e838 100644
--- a/src/AzureDataFactory.TestingFramework/Generated/Models/GoogleCloudStorageLocation.cs
+++ b/src/AzureDataFactory.TestingFramework/Generated/Models/GoogleCloudStorageLocation.cs
@@ -25,7 +25,7 @@ public GoogleCloudStorageLocation()
         /// <param name="additionalProperties"> Additional Properties. </param>
         /// <param name="bucketName"> Specify the bucketName of Google Cloud Storage. Type: string (or Expression with resultType string). </param>
         /// <param name="version"> Specify the version of Google Cloud Storage. Type: string (or Expression with resultType string). </param>
-        internal GoogleCloudStorageLocation(string datasetLocationType, DataFactoryElement<string> folderPath, DataFactoryElement<string> fileName, IDictionary<string, BinaryData> additionalProperties, DataFactoryElement<string> bucketName, DataFactoryElement<string> version) : base(datasetLocationType, folderPath, fileName, additionalProperties)
+        internal GoogleCloudStorageLocation(string datasetLocationType, DataFactoryElement<string> folderPath, DataFactoryElement<string> fileName, IDictionary<string, DataFactoryElement<string>> additionalProperties, DataFactoryElement<string> bucketName, DataFactoryElement<string> version) : base(datasetLocationType, folderPath, fileName, additionalProperties)
         {
             BucketName = bucketName;
             Version = version;
diff --git a/src/AzureDataFactory.TestingFramework/Generated/Models/GoogleCloudStorageReadSettings.Serialization.cs b/src/AzureDataFactory.TestingFramework/Generated/Models/GoogleCloudStorageReadSettings.Serialization.cs
index cc1a8385..6a5cb635 100644
--- a/src/AzureDataFactory.TestingFramework/Generated/Models/GoogleCloudStorageReadSettings.Serialization.cs
+++ b/src/AzureDataFactory.TestingFramework/Generated/Models/GoogleCloudStorageReadSettings.Serialization.cs
@@ -109,8 +109,8 @@ internal static GoogleCloudStorageReadSettings DeserializeGoogleCloudStorageRead
             string type = default;
             Optional<DataFactoryElement<int>> maxConcurrentConnections = default;
             Optional<DataFactoryElement<bool>> disableMetricsCollection = default;
-            IDictionary<string, BinaryData> additionalProperties = default;
-            Dictionary<string, BinaryData> additionalPropertiesDictionary = new Dictionary<string, BinaryData>();
+            IDictionary<string, DataFactoryElement<string>> additionalProperties = default;
+            Dictionary<string, DataFactoryElement<string>> additionalPropertiesDictionary = new Dictionary<string, DataFactoryElement<string>>();
             foreach (var property in element.EnumerateObject())
             {
                 if (property.NameEquals("recursive"u8))
@@ -226,7 +226,7 @@ internal static GoogleCloudStorageReadSettings DeserializeGoogleCloudStorageRead
                     disableMetricsCollection = JsonSerializer.Deserialize<DataFactoryElement<bool>>(property.Value.GetRawText());
                     continue;
                 }
-                additionalPropertiesDictionary.Add(property.Name, BinaryData.FromString(property.Value.GetRawText()));
+                additionalPropertiesDictionary.Add(property.Name, JsonSerializer.Deserialize<DataFactoryElement<string>>(property.Value.GetRawText()));
             }
             additionalProperties = additionalPropertiesDictionary;
             return new GoogleCloudStorageReadSettings(type, maxConcurrentConnections.Value, disableMetricsCollection.Value, additionalProperties, recursive.Value, wildcardFolderPath.Value, wildcardFileName.Value, prefix.Value, fileListPath.Value, enablePartitionDiscovery.Value, partitionRootPath.Value, deleteFilesAfterCompletion.Value, modifiedDatetimeStart.Value, modifiedDatetimeEnd.Value);
diff --git a/src/AzureDataFactory.TestingFramework/Generated/Models/GoogleCloudStorageReadSettings.cs b/src/AzureDataFactory.TestingFramework/Generated/Models/GoogleCloudStorageReadSettings.cs
index 1d05dcd3..ff635a4f 100644
--- a/src/AzureDataFactory.TestingFramework/Generated/Models/GoogleCloudStorageReadSettings.cs
+++ b/src/AzureDataFactory.TestingFramework/Generated/Models/GoogleCloudStorageReadSettings.cs
@@ -33,7 +33,7 @@ public GoogleCloudStorageReadSettings()
         /// <param name="deleteFilesAfterCompletion"> Indicates whether the source files need to be deleted after copy completion. Default is false. Type: boolean (or Expression with resultType boolean). </param>
         /// <param name="modifiedDatetimeStart"> The start of file's modified datetime. Type: string (or Expression with resultType string). </param>
         /// <param name="modifiedDatetimeEnd"> The end of file's modified datetime. Type: string (or Expression with resultType string). </param>
-        internal GoogleCloudStorageReadSettings(string storeReadSettingsType, DataFactoryElement<int> maxConcurrentConnections, DataFactoryElement<bool> disableMetricsCollection, IDictionary<string, BinaryData> additionalProperties, DataFactoryElement<bool> recursive, DataFactoryElement<string> wildcardFolderPath, DataFactoryElement<string> wildcardFileName, DataFactoryElement<string> prefix, DataFactoryElement<string> fileListPath, DataFactoryElement<bool> enablePartitionDiscovery, DataFactoryElement<string> partitionRootPath, DataFactoryElement<bool> deleteFilesAfterCompletion, DataFactoryElement<string> modifiedDatetimeStart, DataFactoryElement<string> modifiedDatetimeEnd) : base(storeReadSettingsType, maxConcurrentConnections, disableMetricsCollection, additionalProperties)
+        internal GoogleCloudStorageReadSettings(string storeReadSettingsType, DataFactoryElement<int> maxConcurrentConnections, DataFactoryElement<bool> disableMetricsCollection, IDictionary<string, DataFactoryElement<string>> additionalProperties, DataFactoryElement<bool> recursive, DataFactoryElement<string> wildcardFolderPath, DataFactoryElement<string> wildcardFileName, DataFactoryElement<string> prefix, DataFactoryElement<string> fileListPath, DataFactoryElement<bool> enablePartitionDiscovery, DataFactoryElement<string> partitionRootPath, DataFactoryElement<bool> deleteFilesAfterCompletion, DataFactoryElement<string> modifiedDatetimeStart, DataFactoryElement<string> modifiedDatetimeEnd) : base(storeReadSettingsType, maxConcurrentConnections, disableMetricsCollection, additionalProperties)
         {
             Recursive = recursive;
             WildcardFolderPath = wildcardFolderPath;
diff --git a/src/AzureDataFactory.TestingFramework/Generated/Models/GoogleSheetsLinkedService.Serialization.cs b/src/AzureDataFactory.TestingFramework/Generated/Models/GoogleSheetsLinkedService.Serialization.cs
index 133ac2af..ff22643b 100644
--- a/src/AzureDataFactory.TestingFramework/Generated/Models/GoogleSheetsLinkedService.Serialization.cs
+++ b/src/AzureDataFactory.TestingFramework/Generated/Models/GoogleSheetsLinkedService.Serialization.cs
@@ -92,8 +92,8 @@ internal static GoogleSheetsLinkedService DeserializeGoogleSheetsLinkedService(J
             Optional<IList<BinaryData>> annotations = default;
             DataFactorySecretBaseDefinition apiToken = default;
             Optional<string> encryptedCredential = default;
-            IDictionary<string, BinaryData> additionalProperties = default;
-            Dictionary<string, BinaryData> additionalPropertiesDictionary = new Dictionary<string, BinaryData>();
+            IDictionary<string, DataFactoryElement<string>> additionalProperties = default;
+            Dictionary<string, DataFactoryElement<string>> additionalPropertiesDictionary = new Dictionary<string, DataFactoryElement<string>>();
             foreach (var property in element.EnumerateObject())
             {
                 if (property.NameEquals("type"u8))
@@ -172,7 +172,7 @@ internal static GoogleSheetsLinkedService DeserializeGoogleSheetsLinkedService(J
                     }
                     continue;
                 }
-                additionalPropertiesDictionary.Add(property.Name, BinaryData.FromString(property.Value.GetRawText()));
+                additionalPropertiesDictionary.Add(property.Name, JsonSerializer.Deserialize<DataFactoryElement<string>>(property.Value.GetRawText()));
             }
             additionalProperties = additionalPropertiesDictionary;
             return new GoogleSheetsLinkedService(type, connectVia.Value, description.Value, Optional.ToDictionary(parameters), Optional.ToList(annotations), additionalProperties, apiToken, encryptedCredential.Value);
diff --git a/src/AzureDataFactory.TestingFramework/Generated/Models/GoogleSheetsLinkedService.cs b/src/AzureDataFactory.TestingFramework/Generated/Models/GoogleSheetsLinkedService.cs
index f7c86b74..5a9c41a6 100644
--- a/src/AzureDataFactory.TestingFramework/Generated/Models/GoogleSheetsLinkedService.cs
+++ b/src/AzureDataFactory.TestingFramework/Generated/Models/GoogleSheetsLinkedService.cs
@@ -33,7 +33,7 @@ public GoogleSheetsLinkedService(DataFactorySecretBaseDefinition apiToken)
         /// <param name="additionalProperties"> Additional Properties. </param>
         /// <param name="apiToken"> The api token for the GoogleSheets source. </param>
         /// <param name="encryptedCredential"> The encrypted credential used for authentication. Credentials are encrypted using the integration runtime credential manager. Type: string. </param>
-        internal GoogleSheetsLinkedService(string linkedServiceType, IntegrationRuntimeReference connectVia, string description, IDictionary<string, EntityParameterSpecification> parameters, IList<BinaryData> annotations, IDictionary<string, BinaryData> additionalProperties, DataFactorySecretBaseDefinition apiToken, string encryptedCredential) : base(linkedServiceType, connectVia, description, parameters, annotations, additionalProperties)
+        internal GoogleSheetsLinkedService(string linkedServiceType, IntegrationRuntimeReference connectVia, string description, IDictionary<string, EntityParameterSpecification> parameters, IList<BinaryData> annotations, IDictionary<string, DataFactoryElement<string>> additionalProperties, DataFactorySecretBaseDefinition apiToken, string encryptedCredential) : base(linkedServiceType, connectVia, description, parameters, annotations, additionalProperties)
         {
             ApiToken = apiToken;
             EncryptedCredential = encryptedCredential;
diff --git a/src/AzureDataFactory.TestingFramework/Generated/Models/GreenplumLinkedService.Serialization.cs b/src/AzureDataFactory.TestingFramework/Generated/Models/GreenplumLinkedService.Serialization.cs
index eab5449b..e8421a2c 100644
--- a/src/AzureDataFactory.TestingFramework/Generated/Models/GreenplumLinkedService.Serialization.cs
+++ b/src/AzureDataFactory.TestingFramework/Generated/Models/GreenplumLinkedService.Serialization.cs
@@ -106,8 +106,8 @@ internal static GreenplumLinkedService DeserializeGreenplumLinkedService(JsonEle
             Optional<BinaryData> connectionString = default;
             Optional<DataFactoryKeyVaultSecretReference> password = default;
             Optional<string> encryptedCredential = default;
-            IDictionary<string, BinaryData> additionalProperties = default;
-            Dictionary<string, BinaryData> additionalPropertiesDictionary = new Dictionary<string, BinaryData>();
+            IDictionary<string, DataFactoryElement<string>> additionalProperties = default;
+            Dictionary<string, DataFactoryElement<string>> additionalPropertiesDictionary = new Dictionary<string, DataFactoryElement<string>>();
             foreach (var property in element.EnumerateObject())
             {
                 if (property.NameEquals("type"u8))
@@ -199,7 +199,7 @@ internal static GreenplumLinkedService DeserializeGreenplumLinkedService(JsonEle
                     }
                     continue;
                 }
-                additionalPropertiesDictionary.Add(property.Name, BinaryData.FromString(property.Value.GetRawText()));
+                additionalPropertiesDictionary.Add(property.Name, JsonSerializer.Deserialize<DataFactoryElement<string>>(property.Value.GetRawText()));
             }
             additionalProperties = additionalPropertiesDictionary;
             return new GreenplumLinkedService(type, connectVia.Value, description.Value, Optional.ToDictionary(parameters), Optional.ToList(annotations), additionalProperties, connectionString.Value, password, encryptedCredential.Value);
diff --git a/src/AzureDataFactory.TestingFramework/Generated/Models/GreenplumLinkedService.cs b/src/AzureDataFactory.TestingFramework/Generated/Models/GreenplumLinkedService.cs
index abfbf379..2a346fda 100644
--- a/src/AzureDataFactory.TestingFramework/Generated/Models/GreenplumLinkedService.cs
+++ b/src/AzureDataFactory.TestingFramework/Generated/Models/GreenplumLinkedService.cs
@@ -28,7 +28,7 @@ public GreenplumLinkedService()
         /// <param name="connectionString"> An ODBC connection string. Type: string, SecureString or AzureKeyVaultSecretReference. </param>
         /// <param name="password"> The Azure key vault secret reference of password in connection string. </param>
         /// <param name="encryptedCredential"> The encrypted credential used for authentication. Credentials are encrypted using the integration runtime credential manager. Type: string. </param>
-        internal GreenplumLinkedService(string linkedServiceType, IntegrationRuntimeReference connectVia, string description, IDictionary<string, EntityParameterSpecification> parameters, IList<BinaryData> annotations, IDictionary<string, BinaryData> additionalProperties, BinaryData connectionString, DataFactoryKeyVaultSecretReference password, string encryptedCredential) : base(linkedServiceType, connectVia, description, parameters, annotations, additionalProperties)
+        internal GreenplumLinkedService(string linkedServiceType, IntegrationRuntimeReference connectVia, string description, IDictionary<string, EntityParameterSpecification> parameters, IList<BinaryData> annotations, IDictionary<string, DataFactoryElement<string>> additionalProperties, BinaryData connectionString, DataFactoryKeyVaultSecretReference password, string encryptedCredential) : base(linkedServiceType, connectVia, description, parameters, annotations, additionalProperties)
         {
             ConnectionString = connectionString;
             Password = password;
diff --git a/src/AzureDataFactory.TestingFramework/Generated/Models/GreenplumSource.Serialization.cs b/src/AzureDataFactory.TestingFramework/Generated/Models/GreenplumSource.Serialization.cs
index 1274a81c..d0a95dca 100644
--- a/src/AzureDataFactory.TestingFramework/Generated/Models/GreenplumSource.Serialization.cs
+++ b/src/AzureDataFactory.TestingFramework/Generated/Models/GreenplumSource.Serialization.cs
@@ -83,8 +83,8 @@ internal static GreenplumSource DeserializeGreenplumSource(JsonElement element)
             Optional<DataFactoryElement<string>> sourceRetryWait = default;
             Optional<DataFactoryElement<int>> maxConcurrentConnections = default;
             Optional<DataFactoryElement<bool>> disableMetricsCollection = default;
-            IDictionary<string, BinaryData> additionalProperties = default;
-            Dictionary<string, BinaryData> additionalPropertiesDictionary = new Dictionary<string, BinaryData>();
+            IDictionary<string, DataFactoryElement<string>> additionalProperties = default;
+            Dictionary<string, DataFactoryElement<string>> additionalPropertiesDictionary = new Dictionary<string, DataFactoryElement<string>>();
             foreach (var property in element.EnumerateObject())
             {
                 if (property.NameEquals("query"u8))
@@ -155,7 +155,7 @@ internal static GreenplumSource DeserializeGreenplumSource(JsonElement element)
                     disableMetricsCollection = JsonSerializer.Deserialize<DataFactoryElement<bool>>(property.Value.GetRawText());
                     continue;
                 }
-                additionalPropertiesDictionary.Add(property.Name, BinaryData.FromString(property.Value.GetRawText()));
+                additionalPropertiesDictionary.Add(property.Name, JsonSerializer.Deserialize<DataFactoryElement<string>>(property.Value.GetRawText()));
             }
             additionalProperties = additionalPropertiesDictionary;
             return new GreenplumSource(type, sourceRetryCount.Value, sourceRetryWait.Value, maxConcurrentConnections.Value, disableMetricsCollection.Value, additionalProperties, queryTimeout.Value, additionalColumns.Value, query.Value);
diff --git a/src/AzureDataFactory.TestingFramework/Generated/Models/GreenplumSource.cs b/src/AzureDataFactory.TestingFramework/Generated/Models/GreenplumSource.cs
index b8e6de28..e0b06d58 100644
--- a/src/AzureDataFactory.TestingFramework/Generated/Models/GreenplumSource.cs
+++ b/src/AzureDataFactory.TestingFramework/Generated/Models/GreenplumSource.cs
@@ -28,7 +28,7 @@ public GreenplumSource()
         /// <param name="queryTimeout"> Query timeout. Type: string (or Expression with resultType string), pattern: ((\d+)\.)?(\d\d):(60|([0-5][0-9])):(60|([0-5][0-9])). </param>
         /// <param name="additionalColumns"> Specifies the additional columns to be added to source data. Type: array of objects(AdditionalColumns) (or Expression with resultType array of objects). </param>
         /// <param name="query"> A query to retrieve data from source. Type: string (or Expression with resultType string). </param>
-        internal GreenplumSource(string copySourceType, DataFactoryElement<int> sourceRetryCount, DataFactoryElement<string> sourceRetryWait, DataFactoryElement<int> maxConcurrentConnections, DataFactoryElement<bool> disableMetricsCollection, IDictionary<string, BinaryData> additionalProperties, DataFactoryElement<string> queryTimeout, BinaryData additionalColumns, DataFactoryElement<string> query) : base(copySourceType, sourceRetryCount, sourceRetryWait, maxConcurrentConnections, disableMetricsCollection, additionalProperties, queryTimeout, additionalColumns)
+        internal GreenplumSource(string copySourceType, DataFactoryElement<int> sourceRetryCount, DataFactoryElement<string> sourceRetryWait, DataFactoryElement<int> maxConcurrentConnections, DataFactoryElement<bool> disableMetricsCollection, IDictionary<string, DataFactoryElement<string>> additionalProperties, DataFactoryElement<string> queryTimeout, BinaryData additionalColumns, DataFactoryElement<string> query) : base(copySourceType, sourceRetryCount, sourceRetryWait, maxConcurrentConnections, disableMetricsCollection, additionalProperties, queryTimeout, additionalColumns)
         {
             Query = query;
             CopySourceType = copySourceType ?? "GreenplumSource";
diff --git a/src/AzureDataFactory.TestingFramework/Generated/Models/GreenplumTableDataset.Serialization.cs b/src/AzureDataFactory.TestingFramework/Generated/Models/GreenplumTableDataset.Serialization.cs
index 8fb97598..e5ef4696 100644
--- a/src/AzureDataFactory.TestingFramework/Generated/Models/GreenplumTableDataset.Serialization.cs
+++ b/src/AzureDataFactory.TestingFramework/Generated/Models/GreenplumTableDataset.Serialization.cs
@@ -120,8 +120,8 @@ internal static GreenplumTableDataset DeserializeGreenplumTableDataset(JsonEleme
             Optional<BinaryData> tableName = default;
             Optional<DataFactoryElement<string>> table = default;
             Optional<DataFactoryElement<string>> schema0 = default;
-            IDictionary<string, BinaryData> additionalProperties = default;
-            Dictionary<string, BinaryData> additionalPropertiesDictionary = new Dictionary<string, BinaryData>();
+            IDictionary<string, DataFactoryElement<string>> additionalProperties = default;
+            Dictionary<string, DataFactoryElement<string>> additionalPropertiesDictionary = new Dictionary<string, DataFactoryElement<string>>();
             foreach (var property in element.EnumerateObject())
             {
                 if (property.NameEquals("type"u8))
@@ -240,7 +240,7 @@ internal static GreenplumTableDataset DeserializeGreenplumTableDataset(JsonEleme
                     }
                     continue;
                 }
-                additionalPropertiesDictionary.Add(property.Name, BinaryData.FromString(property.Value.GetRawText()));
+                additionalPropertiesDictionary.Add(property.Name, JsonSerializer.Deserialize<DataFactoryElement<string>>(property.Value.GetRawText()));
             }
             additionalProperties = additionalPropertiesDictionary;
             return new GreenplumTableDataset(type, description.Value, structure.Value, schema.Value, linkedServiceName, Optional.ToDictionary(parameters), Optional.ToList(annotations), folder.Value, additionalProperties, tableName.Value, table.Value, schema0.Value);
diff --git a/src/AzureDataFactory.TestingFramework/Generated/Models/GreenplumTableDataset.cs b/src/AzureDataFactory.TestingFramework/Generated/Models/GreenplumTableDataset.cs
index 9096479f..7f6e1cfa 100644
--- a/src/AzureDataFactory.TestingFramework/Generated/Models/GreenplumTableDataset.cs
+++ b/src/AzureDataFactory.TestingFramework/Generated/Models/GreenplumTableDataset.cs
@@ -36,7 +36,7 @@ public GreenplumTableDataset(DataFactoryLinkedServiceReference linkedServiceName
         /// <param name="tableName"> This property will be retired. Please consider using schema + table properties instead. </param>
         /// <param name="table"> The table name of Greenplum. Type: string (or Expression with resultType string). </param>
         /// <param name="schemaTypePropertiesSchema"> The schema name of Greenplum. Type: string (or Expression with resultType string). </param>
-        internal GreenplumTableDataset(string datasetType, string description, DataFactoryElement<IList<DatasetDataElement>> structure, DataFactoryElement<IList<DatasetSchemaDataElement>> schema, DataFactoryLinkedServiceReference linkedServiceName, IDictionary<string, EntityParameterSpecification> parameters, IList<BinaryData> annotations, DatasetFolder folder, IDictionary<string, BinaryData> additionalProperties, BinaryData tableName, DataFactoryElement<string> table, DataFactoryElement<string> schemaTypePropertiesSchema) : base(datasetType, description, structure, schema, linkedServiceName, parameters, annotations, folder, additionalProperties)
+        internal GreenplumTableDataset(string datasetType, string description, DataFactoryElement<IList<DatasetDataElement>> structure, DataFactoryElement<IList<DatasetSchemaDataElement>> schema, DataFactoryLinkedServiceReference linkedServiceName, IDictionary<string, EntityParameterSpecification> parameters, IList<BinaryData> annotations, DatasetFolder folder, IDictionary<string, DataFactoryElement<string>> additionalProperties, BinaryData tableName, DataFactoryElement<string> table, DataFactoryElement<string> schemaTypePropertiesSchema) : base(datasetType, description, structure, schema, linkedServiceName, parameters, annotations, folder, additionalProperties)
         {
             TableName = tableName;
             Table = table;
diff --git a/src/AzureDataFactory.TestingFramework/Generated/Models/HBaseLinkedService.Serialization.cs b/src/AzureDataFactory.TestingFramework/Generated/Models/HBaseLinkedService.Serialization.cs
index 4f2f5b4b..20c3b908 100644
--- a/src/AzureDataFactory.TestingFramework/Generated/Models/HBaseLinkedService.Serialization.cs
+++ b/src/AzureDataFactory.TestingFramework/Generated/Models/HBaseLinkedService.Serialization.cs
@@ -144,8 +144,8 @@ internal static HBaseLinkedService DeserializeHBaseLinkedService(JsonElement ele
             Optional<DataFactoryElement<bool>> allowHostNameCNMismatch = default;
             Optional<DataFactoryElement<bool>> allowSelfSignedServerCert = default;
             Optional<string> encryptedCredential = default;
-            IDictionary<string, BinaryData> additionalProperties = default;
-            Dictionary<string, BinaryData> additionalPropertiesDictionary = new Dictionary<string, BinaryData>();
+            IDictionary<string, DataFactoryElement<string>> additionalProperties = default;
+            Dictionary<string, DataFactoryElement<string>> additionalPropertiesDictionary = new Dictionary<string, DataFactoryElement<string>>();
             foreach (var property in element.EnumerateObject())
             {
                 if (property.NameEquals("type"u8))
@@ -301,7 +301,7 @@ internal static HBaseLinkedService DeserializeHBaseLinkedService(JsonElement ele
                     }
                     continue;
                 }
-                additionalPropertiesDictionary.Add(property.Name, BinaryData.FromString(property.Value.GetRawText()));
+                additionalPropertiesDictionary.Add(property.Name, JsonSerializer.Deserialize<DataFactoryElement<string>>(property.Value.GetRawText()));
             }
             additionalProperties = additionalPropertiesDictionary;
             return new HBaseLinkedService(type, connectVia.Value, description.Value, Optional.ToDictionary(parameters), Optional.ToList(annotations), additionalProperties, host, port.Value, httpPath.Value, authenticationType, username.Value, password, enableSsl.Value, trustedCertPath.Value, allowHostNameCNMismatch.Value, allowSelfSignedServerCert.Value, encryptedCredential.Value);
diff --git a/src/AzureDataFactory.TestingFramework/Generated/Models/HBaseLinkedService.cs b/src/AzureDataFactory.TestingFramework/Generated/Models/HBaseLinkedService.cs
index 92522e93..ab642f10 100644
--- a/src/AzureDataFactory.TestingFramework/Generated/Models/HBaseLinkedService.cs
+++ b/src/AzureDataFactory.TestingFramework/Generated/Models/HBaseLinkedService.cs
@@ -44,7 +44,7 @@ public HBaseLinkedService(DataFactoryElement<string> host, HBaseAuthenticationTy
         /// <param name="allowHostNameCNMismatch"> Specifies whether to require a CA-issued SSL certificate name to match the host name of the server when connecting over SSL. The default value is false. </param>
         /// <param name="allowSelfSignedServerCert"> Specifies whether to allow self-signed certificates from the server. The default value is false. </param>
         /// <param name="encryptedCredential"> The encrypted credential used for authentication. Credentials are encrypted using the integration runtime credential manager. Type: string. </param>
-        internal HBaseLinkedService(string linkedServiceType, IntegrationRuntimeReference connectVia, string description, IDictionary<string, EntityParameterSpecification> parameters, IList<BinaryData> annotations, IDictionary<string, BinaryData> additionalProperties, DataFactoryElement<string> host, DataFactoryElement<int> port, DataFactoryElement<string> httpPath, HBaseAuthenticationType authenticationType, DataFactoryElement<string> username, DataFactorySecretBaseDefinition password, DataFactoryElement<bool> enableSsl, DataFactoryElement<string> trustedCertPath, DataFactoryElement<bool> allowHostNameCNMismatch, DataFactoryElement<bool> allowSelfSignedServerCert, string encryptedCredential) : base(linkedServiceType, connectVia, description, parameters, annotations, additionalProperties)
+        internal HBaseLinkedService(string linkedServiceType, IntegrationRuntimeReference connectVia, string description, IDictionary<string, EntityParameterSpecification> parameters, IList<BinaryData> annotations, IDictionary<string, DataFactoryElement<string>> additionalProperties, DataFactoryElement<string> host, DataFactoryElement<int> port, DataFactoryElement<string> httpPath, HBaseAuthenticationType authenticationType, DataFactoryElement<string> username, DataFactorySecretBaseDefinition password, DataFactoryElement<bool> enableSsl, DataFactoryElement<string> trustedCertPath, DataFactoryElement<bool> allowHostNameCNMismatch, DataFactoryElement<bool> allowSelfSignedServerCert, string encryptedCredential) : base(linkedServiceType, connectVia, description, parameters, annotations, additionalProperties)
         {
             Host = host;
             Port = port;
diff --git a/src/AzureDataFactory.TestingFramework/Generated/Models/HBaseObjectDataset.Serialization.cs b/src/AzureDataFactory.TestingFramework/Generated/Models/HBaseObjectDataset.Serialization.cs
index 78e6c058..b62929f2 100644
--- a/src/AzureDataFactory.TestingFramework/Generated/Models/HBaseObjectDataset.Serialization.cs
+++ b/src/AzureDataFactory.TestingFramework/Generated/Models/HBaseObjectDataset.Serialization.cs
@@ -104,8 +104,8 @@ internal static HBaseObjectDataset DeserializeHBaseObjectDataset(JsonElement ele
             Optional<IList<BinaryData>> annotations = default;
             Optional<DatasetFolder> folder = default;
             Optional<DataFactoryElement<string>> tableName = default;
-            IDictionary<string, BinaryData> additionalProperties = default;
-            Dictionary<string, BinaryData> additionalPropertiesDictionary = new Dictionary<string, BinaryData>();
+            IDictionary<string, DataFactoryElement<string>> additionalProperties = default;
+            Dictionary<string, DataFactoryElement<string>> additionalPropertiesDictionary = new Dictionary<string, DataFactoryElement<string>>();
             foreach (var property in element.EnumerateObject())
             {
                 if (property.NameEquals("type"u8))
@@ -206,7 +206,7 @@ internal static HBaseObjectDataset DeserializeHBaseObjectDataset(JsonElement ele
                     }
                     continue;
                 }
-                additionalPropertiesDictionary.Add(property.Name, BinaryData.FromString(property.Value.GetRawText()));
+                additionalPropertiesDictionary.Add(property.Name, JsonSerializer.Deserialize<DataFactoryElement<string>>(property.Value.GetRawText()));
             }
             additionalProperties = additionalPropertiesDictionary;
             return new HBaseObjectDataset(type, description.Value, structure.Value, schema.Value, linkedServiceName, Optional.ToDictionary(parameters), Optional.ToList(annotations), folder.Value, additionalProperties, tableName.Value);
diff --git a/src/AzureDataFactory.TestingFramework/Generated/Models/HBaseObjectDataset.cs b/src/AzureDataFactory.TestingFramework/Generated/Models/HBaseObjectDataset.cs
index 47ba2a55..19e7b401 100644
--- a/src/AzureDataFactory.TestingFramework/Generated/Models/HBaseObjectDataset.cs
+++ b/src/AzureDataFactory.TestingFramework/Generated/Models/HBaseObjectDataset.cs
@@ -34,7 +34,7 @@ public HBaseObjectDataset(DataFactoryLinkedServiceReference linkedServiceName) :
         /// <param name="folder"> The folder that this Dataset is in. If not specified, Dataset will appear at the root level. </param>
         /// <param name="additionalProperties"> Additional Properties. </param>
         /// <param name="tableName"> The table name. Type: string (or Expression with resultType string). </param>
-        internal HBaseObjectDataset(string datasetType, string description, DataFactoryElement<IList<DatasetDataElement>> structure, DataFactoryElement<IList<DatasetSchemaDataElement>> schema, DataFactoryLinkedServiceReference linkedServiceName, IDictionary<string, EntityParameterSpecification> parameters, IList<BinaryData> annotations, DatasetFolder folder, IDictionary<string, BinaryData> additionalProperties, DataFactoryElement<string> tableName) : base(datasetType, description, structure, schema, linkedServiceName, parameters, annotations, folder, additionalProperties)
+        internal HBaseObjectDataset(string datasetType, string description, DataFactoryElement<IList<DatasetDataElement>> structure, DataFactoryElement<IList<DatasetSchemaDataElement>> schema, DataFactoryLinkedServiceReference linkedServiceName, IDictionary<string, EntityParameterSpecification> parameters, IList<BinaryData> annotations, DatasetFolder folder, IDictionary<string, DataFactoryElement<string>> additionalProperties, DataFactoryElement<string> tableName) : base(datasetType, description, structure, schema, linkedServiceName, parameters, annotations, folder, additionalProperties)
         {
             TableName = tableName;
             DatasetType = datasetType ?? "HBaseObject";
diff --git a/src/AzureDataFactory.TestingFramework/Generated/Models/HBaseSource.Serialization.cs b/src/AzureDataFactory.TestingFramework/Generated/Models/HBaseSource.Serialization.cs
index 69066eef..b7aafc7d 100644
--- a/src/AzureDataFactory.TestingFramework/Generated/Models/HBaseSource.Serialization.cs
+++ b/src/AzureDataFactory.TestingFramework/Generated/Models/HBaseSource.Serialization.cs
@@ -83,8 +83,8 @@ internal static HBaseSource DeserializeHBaseSource(JsonElement element)
             Optional<DataFactoryElement<string>> sourceRetryWait = default;
             Optional<DataFactoryElement<int>> maxConcurrentConnections = default;
             Optional<DataFactoryElement<bool>> disableMetricsCollection = default;
-            IDictionary<string, BinaryData> additionalProperties = default;
-            Dictionary<string, BinaryData> additionalPropertiesDictionary = new Dictionary<string, BinaryData>();
+            IDictionary<string, DataFactoryElement<string>> additionalProperties = default;
+            Dictionary<string, DataFactoryElement<string>> additionalPropertiesDictionary = new Dictionary<string, DataFactoryElement<string>>();
             foreach (var property in element.EnumerateObject())
             {
                 if (property.NameEquals("query"u8))
@@ -155,7 +155,7 @@ internal static HBaseSource DeserializeHBaseSource(JsonElement element)
                     disableMetricsCollection = JsonSerializer.Deserialize<DataFactoryElement<bool>>(property.Value.GetRawText());
                     continue;
                 }
-                additionalPropertiesDictionary.Add(property.Name, BinaryData.FromString(property.Value.GetRawText()));
+                additionalPropertiesDictionary.Add(property.Name, JsonSerializer.Deserialize<DataFactoryElement<string>>(property.Value.GetRawText()));
             }
             additionalProperties = additionalPropertiesDictionary;
             return new HBaseSource(type, sourceRetryCount.Value, sourceRetryWait.Value, maxConcurrentConnections.Value, disableMetricsCollection.Value, additionalProperties, queryTimeout.Value, additionalColumns.Value, query.Value);
diff --git a/src/AzureDataFactory.TestingFramework/Generated/Models/HBaseSource.cs b/src/AzureDataFactory.TestingFramework/Generated/Models/HBaseSource.cs
index 58b97e42..821e04d0 100644
--- a/src/AzureDataFactory.TestingFramework/Generated/Models/HBaseSource.cs
+++ b/src/AzureDataFactory.TestingFramework/Generated/Models/HBaseSource.cs
@@ -28,7 +28,7 @@ public HBaseSource()
         /// <param name="queryTimeout"> Query timeout. Type: string (or Expression with resultType string), pattern: ((\d+)\.)?(\d\d):(60|([0-5][0-9])):(60|([0-5][0-9])). </param>
         /// <param name="additionalColumns"> Specifies the additional columns to be added to source data. Type: array of objects(AdditionalColumns) (or Expression with resultType array of objects). </param>
         /// <param name="query"> A query to retrieve data from source. Type: string (or Expression with resultType string). </param>
-        internal HBaseSource(string copySourceType, DataFactoryElement<int> sourceRetryCount, DataFactoryElement<string> sourceRetryWait, DataFactoryElement<int> maxConcurrentConnections, DataFactoryElement<bool> disableMetricsCollection, IDictionary<string, BinaryData> additionalProperties, DataFactoryElement<string> queryTimeout, BinaryData additionalColumns, DataFactoryElement<string> query) : base(copySourceType, sourceRetryCount, sourceRetryWait, maxConcurrentConnections, disableMetricsCollection, additionalProperties, queryTimeout, additionalColumns)
+        internal HBaseSource(string copySourceType, DataFactoryElement<int> sourceRetryCount, DataFactoryElement<string> sourceRetryWait, DataFactoryElement<int> maxConcurrentConnections, DataFactoryElement<bool> disableMetricsCollection, IDictionary<string, DataFactoryElement<string>> additionalProperties, DataFactoryElement<string> queryTimeout, BinaryData additionalColumns, DataFactoryElement<string> query) : base(copySourceType, sourceRetryCount, sourceRetryWait, maxConcurrentConnections, disableMetricsCollection, additionalProperties, queryTimeout, additionalColumns)
         {
             Query = query;
             CopySourceType = copySourceType ?? "HBaseSource";
diff --git a/src/AzureDataFactory.TestingFramework/Generated/Models/HDInsightHiveActivity.Serialization.cs b/src/AzureDataFactory.TestingFramework/Generated/Models/HDInsightHiveActivity.Serialization.cs
index 4cf201ae..4d2324fb 100644
--- a/src/AzureDataFactory.TestingFramework/Generated/Models/HDInsightHiveActivity.Serialization.cs
+++ b/src/AzureDataFactory.TestingFramework/Generated/Models/HDInsightHiveActivity.Serialization.cs
@@ -189,11 +189,11 @@ internal static HDInsightHiveActivity DeserializeHDInsightHiveActivity(JsonEleme
             Optional<HDInsightActivityDebugInfoOptionSetting> getDebugInfo = default;
             Optional<DataFactoryElement<string>> scriptPath = default;
             Optional<DataFactoryLinkedServiceReference> scriptLinkedService = default;
-            Optional<IDictionary<string, BinaryData>> defines = default;
-            Optional<IDictionary<string, BinaryData>> variables = default;
+            Optional<IDictionary<string, DataFactoryElement<string>>> defines = default;
+            Optional<IDictionary<string, DataFactoryElement<string>>> variables = default;
             Optional<int> queryTimeout = default;
-            IDictionary<string, BinaryData> additionalProperties = default;
-            Dictionary<string, BinaryData> additionalPropertiesDictionary = new Dictionary<string, BinaryData>();
+            IDictionary<string, DataFactoryElement<string>> additionalProperties = default;
+            Dictionary<string, DataFactoryElement<string>> additionalPropertiesDictionary = new Dictionary<string, DataFactoryElement<string>>();
             foreach (var property in element.EnumerateObject())
             {
                 if (property.NameEquals("linkedServiceName"u8))
@@ -352,7 +352,7 @@ internal static HDInsightHiveActivity DeserializeHDInsightHiveActivity(JsonEleme
                             {
                                 continue;
                             }
-                            Dictionary<string, BinaryData> dictionary = new Dictionary<string, BinaryData>();
+                            Dictionary<string, DataFactoryElement<string>> dictionary = new Dictionary<string, DataFactoryElement<string>>();
                             foreach (var property1 in property0.Value.EnumerateObject())
                             {
                                 if (property1.Value.ValueKind == JsonValueKind.Null)
@@ -361,7 +361,7 @@ internal static HDInsightHiveActivity DeserializeHDInsightHiveActivity(JsonEleme
                                 }
                                 else
                                 {
-                                    dictionary.Add(property1.Name, BinaryData.FromString(property1.Value.GetRawText()));
+                                    dictionary.Add(property1.Name, JsonSerializer.Deserialize<DataFactoryElement<string>>(property1.Value.GetRawText()));
                                 }
                             }
                             defines = dictionary;
@@ -373,7 +373,7 @@ internal static HDInsightHiveActivity DeserializeHDInsightHiveActivity(JsonEleme
                             {
                                 continue;
                             }
-                            Dictionary<string, BinaryData> dictionary = new Dictionary<string, BinaryData>();
+                            Dictionary<string, DataFactoryElement<string>> dictionary = new Dictionary<string, DataFactoryElement<string>>();
                             foreach (var property1 in property0.Value.EnumerateObject())
                             {
                                 if (property1.Value.ValueKind == JsonValueKind.Null)
@@ -382,7 +382,7 @@ internal static HDInsightHiveActivity DeserializeHDInsightHiveActivity(JsonEleme
                                 }
                                 else
                                 {
-                                    dictionary.Add(property1.Name, BinaryData.FromString(property1.Value.GetRawText()));
+                                    dictionary.Add(property1.Name, JsonSerializer.Deserialize<DataFactoryElement<string>>(property1.Value.GetRawText()));
                                 }
                             }
                             variables = dictionary;
@@ -400,7 +400,7 @@ internal static HDInsightHiveActivity DeserializeHDInsightHiveActivity(JsonEleme
                     }
                     continue;
                 }
-                additionalPropertiesDictionary.Add(property.Name, BinaryData.FromString(property.Value.GetRawText()));
+                additionalPropertiesDictionary.Add(property.Name, JsonSerializer.Deserialize<DataFactoryElement<string>>(property.Value.GetRawText()));
             }
             additionalProperties = additionalPropertiesDictionary;
             return new HDInsightHiveActivity(name, type, description.Value, Optional.ToNullable(state), Optional.ToNullable(onInactiveMarkAs), Optional.ToList(dependsOn), Optional.ToList(userProperties), additionalProperties, linkedServiceName, policy.Value, Optional.ToList(storageLinkedServices), Optional.ToList(arguments), Optional.ToNullable(getDebugInfo), scriptPath.Value, scriptLinkedService, Optional.ToDictionary(defines), Optional.ToDictionary(variables), Optional.ToNullable(queryTimeout));
diff --git a/src/AzureDataFactory.TestingFramework/Generated/Models/HDInsightHiveActivity.cs b/src/AzureDataFactory.TestingFramework/Generated/Models/HDInsightHiveActivity.cs
index 112512dc..d6e38144 100644
--- a/src/AzureDataFactory.TestingFramework/Generated/Models/HDInsightHiveActivity.cs
+++ b/src/AzureDataFactory.TestingFramework/Generated/Models/HDInsightHiveActivity.cs
@@ -22,8 +22,8 @@ public HDInsightHiveActivity(string name) : base(name)
 
             StorageLinkedServices = new ChangeTrackingList<DataFactoryLinkedServiceReference>();
             Arguments = new ChangeTrackingList<BinaryData>();
-            Defines = new ChangeTrackingDictionary<string, BinaryData>();
-            Variables = new ChangeTrackingDictionary<string, BinaryData>();
+            Defines = new ChangeTrackingDictionary<string, DataFactoryElement<string>>();
+            Variables = new ChangeTrackingDictionary<string, DataFactoryElement<string>>();
             ActivityType = "HDInsightHive";
         }
 
@@ -46,7 +46,7 @@ public HDInsightHiveActivity(string name) : base(name)
         /// <param name="defines"> Allows user to specify defines for Hive job request. </param>
         /// <param name="variables"> User specified arguments under hivevar namespace. </param>
         /// <param name="queryTimeout"> Query timeout value (in minutes).  Effective when the HDInsight cluster is with ESP (Enterprise Security Package). </param>
-        internal HDInsightHiveActivity(string name, string activityType, string description, PipelineActivityState? state, ActivityOnInactiveMarkAs? onInactiveMarkAs, IList<PipelineActivityDependency> dependsOn, IList<PipelineActivityUserProperty> userProperties, IDictionary<string, BinaryData> additionalProperties, DataFactoryLinkedServiceReference linkedServiceName, PipelineActivityPolicy policy, IList<DataFactoryLinkedServiceReference> storageLinkedServices, IList<BinaryData> arguments, HDInsightActivityDebugInfoOptionSetting? getDebugInfo, DataFactoryElement<string> scriptPath, DataFactoryLinkedServiceReference scriptLinkedService, IDictionary<string, BinaryData> defines, IDictionary<string, BinaryData> variables, int? queryTimeout) : base(name, activityType, description, state, onInactiveMarkAs, dependsOn, userProperties, additionalProperties, linkedServiceName, policy)
+        internal HDInsightHiveActivity(string name, string activityType, string description, PipelineActivityState? state, ActivityOnInactiveMarkAs? onInactiveMarkAs, IList<PipelineActivityDependency> dependsOn, IList<PipelineActivityUserProperty> userProperties, IDictionary<string, DataFactoryElement<string>> additionalProperties, DataFactoryLinkedServiceReference linkedServiceName, PipelineActivityPolicy policy, IList<DataFactoryLinkedServiceReference> storageLinkedServices, IList<BinaryData> arguments, HDInsightActivityDebugInfoOptionSetting? getDebugInfo, DataFactoryElement<string> scriptPath, DataFactoryLinkedServiceReference scriptLinkedService, IDictionary<string, DataFactoryElement<string>> defines, IDictionary<string, DataFactoryElement<string>> variables, int? queryTimeout) : base(name, activityType, description, state, onInactiveMarkAs, dependsOn, userProperties, additionalProperties, linkedServiceName, policy)
         {
             StorageLinkedServices = storageLinkedServices;
             Arguments = arguments;
@@ -128,7 +128,7 @@ internal HDInsightHiveActivity(string name, string activityType, string descript
         /// </list>
         /// </para>
         /// </summary>
-        public IDictionary<string, BinaryData> Defines { get; }
+        public IDictionary<string, DataFactoryElement<string>> Defines { get; }
         /// <summary>
         /// User specified arguments under hivevar namespace.
         /// <para>
@@ -159,7 +159,7 @@ internal HDInsightHiveActivity(string name, string activityType, string descript
         /// </list>
         /// </para>
         /// </summary>
-        public IDictionary<string, BinaryData> Variables { get; }
+        public IDictionary<string, DataFactoryElement<string>> Variables { get; }
         /// <summary> Query timeout value (in minutes).  Effective when the HDInsight cluster is with ESP (Enterprise Security Package). </summary>
         public int? QueryTimeout { get; set; }
     }
diff --git a/src/AzureDataFactory.TestingFramework/Generated/Models/HDInsightLinkedService.Serialization.cs b/src/AzureDataFactory.TestingFramework/Generated/Models/HDInsightLinkedService.Serialization.cs
index 31e2c63c..903c36c1 100644
--- a/src/AzureDataFactory.TestingFramework/Generated/Models/HDInsightLinkedService.Serialization.cs
+++ b/src/AzureDataFactory.TestingFramework/Generated/Models/HDInsightLinkedService.Serialization.cs
@@ -129,8 +129,8 @@ internal static HDInsightLinkedService DeserializeHDInsightLinkedService(JsonEle
             Optional<string> encryptedCredential = default;
             Optional<DataFactoryElement<bool>> isEspEnabled = default;
             Optional<DataFactoryElement<string>> fileSystem = default;
-            IDictionary<string, BinaryData> additionalProperties = default;
-            Dictionary<string, BinaryData> additionalPropertiesDictionary = new Dictionary<string, BinaryData>();
+            IDictionary<string, DataFactoryElement<string>> additionalProperties = default;
+            Dictionary<string, DataFactoryElement<string>> additionalPropertiesDictionary = new Dictionary<string, DataFactoryElement<string>>();
             foreach (var property in element.EnumerateObject())
             {
                 if (property.NameEquals("type"u8))
@@ -263,7 +263,7 @@ internal static HDInsightLinkedService DeserializeHDInsightLinkedService(JsonEle
                     }
                     continue;
                 }
-                additionalPropertiesDictionary.Add(property.Name, BinaryData.FromString(property.Value.GetRawText()));
+                additionalPropertiesDictionary.Add(property.Name, JsonSerializer.Deserialize<DataFactoryElement<string>>(property.Value.GetRawText()));
             }
             additionalProperties = additionalPropertiesDictionary;
             return new HDInsightLinkedService(type, connectVia.Value, description.Value, Optional.ToDictionary(parameters), Optional.ToList(annotations), additionalProperties, clusterUri, userName.Value, password, linkedServiceName, hcatalogLinkedServiceName, encryptedCredential.Value, isEspEnabled.Value, fileSystem.Value);
diff --git a/src/AzureDataFactory.TestingFramework/Generated/Models/HDInsightLinkedService.cs b/src/AzureDataFactory.TestingFramework/Generated/Models/HDInsightLinkedService.cs
index f01de1b9..0c45636b 100644
--- a/src/AzureDataFactory.TestingFramework/Generated/Models/HDInsightLinkedService.cs
+++ b/src/AzureDataFactory.TestingFramework/Generated/Models/HDInsightLinkedService.cs
@@ -39,7 +39,7 @@ public HDInsightLinkedService(DataFactoryElement<string> clusterUri)
         /// <param name="encryptedCredential"> The encrypted credential used for authentication. Credentials are encrypted using the integration runtime credential manager. Type: string. </param>
         /// <param name="isEspEnabled"> Specify if the HDInsight is created with ESP (Enterprise Security Package). Type: Boolean. </param>
         /// <param name="fileSystem"> Specify the FileSystem if the main storage for the HDInsight is ADLS Gen2. Type: string (or Expression with resultType string). </param>
-        internal HDInsightLinkedService(string linkedServiceType, IntegrationRuntimeReference connectVia, string description, IDictionary<string, EntityParameterSpecification> parameters, IList<BinaryData> annotations, IDictionary<string, BinaryData> additionalProperties, DataFactoryElement<string> clusterUri, DataFactoryElement<string> userName, DataFactorySecretBaseDefinition password, DataFactoryLinkedServiceReference linkedServiceName, DataFactoryLinkedServiceReference hcatalogLinkedServiceName, string encryptedCredential, DataFactoryElement<bool> isEspEnabled, DataFactoryElement<string> fileSystem) : base(linkedServiceType, connectVia, description, parameters, annotations, additionalProperties)
+        internal HDInsightLinkedService(string linkedServiceType, IntegrationRuntimeReference connectVia, string description, IDictionary<string, EntityParameterSpecification> parameters, IList<BinaryData> annotations, IDictionary<string, DataFactoryElement<string>> additionalProperties, DataFactoryElement<string> clusterUri, DataFactoryElement<string> userName, DataFactorySecretBaseDefinition password, DataFactoryLinkedServiceReference linkedServiceName, DataFactoryLinkedServiceReference hcatalogLinkedServiceName, string encryptedCredential, DataFactoryElement<bool> isEspEnabled, DataFactoryElement<string> fileSystem) : base(linkedServiceType, connectVia, description, parameters, annotations, additionalProperties)
         {
             ClusterUri = clusterUri;
             UserName = userName;
diff --git a/src/AzureDataFactory.TestingFramework/Generated/Models/HDInsightMapReduceActivity.Serialization.cs b/src/AzureDataFactory.TestingFramework/Generated/Models/HDInsightMapReduceActivity.Serialization.cs
index 95e70992..37e22025 100644
--- a/src/AzureDataFactory.TestingFramework/Generated/Models/HDInsightMapReduceActivity.Serialization.cs
+++ b/src/AzureDataFactory.TestingFramework/Generated/Models/HDInsightMapReduceActivity.Serialization.cs
@@ -184,9 +184,9 @@ internal static HDInsightMapReduceActivity DeserializeHDInsightMapReduceActivity
             DataFactoryElement<string> jarFilePath = default;
             Optional<DataFactoryLinkedServiceReference> jarLinkedService = default;
             Optional<IList<BinaryData>> jarLibs = default;
-            Optional<IDictionary<string, BinaryData>> defines = default;
-            IDictionary<string, BinaryData> additionalProperties = default;
-            Dictionary<string, BinaryData> additionalPropertiesDictionary = new Dictionary<string, BinaryData>();
+            Optional<IDictionary<string, DataFactoryElement<string>>> defines = default;
+            IDictionary<string, DataFactoryElement<string>> additionalProperties = default;
+            Dictionary<string, DataFactoryElement<string>> additionalPropertiesDictionary = new Dictionary<string, DataFactoryElement<string>>();
             foreach (var property in element.EnumerateObject())
             {
                 if (property.NameEquals("linkedServiceName"u8))
@@ -367,7 +367,7 @@ internal static HDInsightMapReduceActivity DeserializeHDInsightMapReduceActivity
                             {
                                 continue;
                             }
-                            Dictionary<string, BinaryData> dictionary = new Dictionary<string, BinaryData>();
+                            Dictionary<string, DataFactoryElement<string>> dictionary = new Dictionary<string, DataFactoryElement<string>>();
                             foreach (var property1 in property0.Value.EnumerateObject())
                             {
                                 if (property1.Value.ValueKind == JsonValueKind.Null)
@@ -376,7 +376,7 @@ internal static HDInsightMapReduceActivity DeserializeHDInsightMapReduceActivity
                                 }
                                 else
                                 {
-                                    dictionary.Add(property1.Name, BinaryData.FromString(property1.Value.GetRawText()));
+                                    dictionary.Add(property1.Name, JsonSerializer.Deserialize<DataFactoryElement<string>>(property1.Value.GetRawText()));
                                 }
                             }
                             defines = dictionary;
@@ -385,7 +385,7 @@ internal static HDInsightMapReduceActivity DeserializeHDInsightMapReduceActivity
                     }
                     continue;
                 }
-                additionalPropertiesDictionary.Add(property.Name, BinaryData.FromString(property.Value.GetRawText()));
+                additionalPropertiesDictionary.Add(property.Name, JsonSerializer.Deserialize<DataFactoryElement<string>>(property.Value.GetRawText()));
             }
             additionalProperties = additionalPropertiesDictionary;
             return new HDInsightMapReduceActivity(name, type, description.Value, Optional.ToNullable(state), Optional.ToNullable(onInactiveMarkAs), Optional.ToList(dependsOn), Optional.ToList(userProperties), additionalProperties, linkedServiceName, policy.Value, Optional.ToList(storageLinkedServices), Optional.ToList(arguments), Optional.ToNullable(getDebugInfo), className, jarFilePath, jarLinkedService, Optional.ToList(jarLibs), Optional.ToDictionary(defines));
diff --git a/src/AzureDataFactory.TestingFramework/Generated/Models/HDInsightMapReduceActivity.cs b/src/AzureDataFactory.TestingFramework/Generated/Models/HDInsightMapReduceActivity.cs
index b21f1a7d..b0d7bc03 100644
--- a/src/AzureDataFactory.TestingFramework/Generated/Models/HDInsightMapReduceActivity.cs
+++ b/src/AzureDataFactory.TestingFramework/Generated/Models/HDInsightMapReduceActivity.cs
@@ -29,7 +29,7 @@ public HDInsightMapReduceActivity(string name, DataFactoryElement<string> classN
             ClassName = className;
             JarFilePath = jarFilePath;
             JarLibs = new ChangeTrackingList<BinaryData>();
-            Defines = new ChangeTrackingDictionary<string, BinaryData>();
+            Defines = new ChangeTrackingDictionary<string, DataFactoryElement<string>>();
             ActivityType = "HDInsightMapReduce";
         }
 
@@ -52,7 +52,7 @@ public HDInsightMapReduceActivity(string name, DataFactoryElement<string> classN
         /// <param name="jarLinkedService"> Jar linked service reference. </param>
         /// <param name="jarLibs"> Jar libs. </param>
         /// <param name="defines"> Allows user to specify defines for the MapReduce job request. </param>
-        internal HDInsightMapReduceActivity(string name, string activityType, string description, PipelineActivityState? state, ActivityOnInactiveMarkAs? onInactiveMarkAs, IList<PipelineActivityDependency> dependsOn, IList<PipelineActivityUserProperty> userProperties, IDictionary<string, BinaryData> additionalProperties, DataFactoryLinkedServiceReference linkedServiceName, PipelineActivityPolicy policy, IList<DataFactoryLinkedServiceReference> storageLinkedServices, IList<BinaryData> arguments, HDInsightActivityDebugInfoOptionSetting? getDebugInfo, DataFactoryElement<string> className, DataFactoryElement<string> jarFilePath, DataFactoryLinkedServiceReference jarLinkedService, IList<BinaryData> jarLibs, IDictionary<string, BinaryData> defines) : base(name, activityType, description, state, onInactiveMarkAs, dependsOn, userProperties, additionalProperties, linkedServiceName, policy)
+        internal HDInsightMapReduceActivity(string name, string activityType, string description, PipelineActivityState? state, ActivityOnInactiveMarkAs? onInactiveMarkAs, IList<PipelineActivityDependency> dependsOn, IList<PipelineActivityUserProperty> userProperties, IDictionary<string, DataFactoryElement<string>> additionalProperties, DataFactoryLinkedServiceReference linkedServiceName, PipelineActivityPolicy policy, IList<DataFactoryLinkedServiceReference> storageLinkedServices, IList<BinaryData> arguments, HDInsightActivityDebugInfoOptionSetting? getDebugInfo, DataFactoryElement<string> className, DataFactoryElement<string> jarFilePath, DataFactoryLinkedServiceReference jarLinkedService, IList<BinaryData> jarLibs, IDictionary<string, DataFactoryElement<string>> defines) : base(name, activityType, description, state, onInactiveMarkAs, dependsOn, userProperties, additionalProperties, linkedServiceName, policy)
         {
             StorageLinkedServices = storageLinkedServices;
             Arguments = arguments;
@@ -167,6 +167,6 @@ internal HDInsightMapReduceActivity(string name, string activityType, string des
         /// </list>
         /// </para>
         /// </summary>
-        public IDictionary<string, BinaryData> Defines { get; }
+        public IDictionary<string, DataFactoryElement<string>> Defines { get; }
     }
 }
diff --git a/src/AzureDataFactory.TestingFramework/Generated/Models/HDInsightOnDemandLinkedService.Serialization.cs b/src/AzureDataFactory.TestingFramework/Generated/Models/HDInsightOnDemandLinkedService.Serialization.cs
index 5c6c3d39..3ca556d7 100644
--- a/src/AzureDataFactory.TestingFramework/Generated/Models/HDInsightOnDemandLinkedService.Serialization.cs
+++ b/src/AzureDataFactory.TestingFramework/Generated/Models/HDInsightOnDemandLinkedService.Serialization.cs
@@ -320,8 +320,8 @@ internal static HDInsightOnDemandLinkedService DeserializeHDInsightOnDemandLinke
             Optional<DataFactoryElement<string>> virtualNetworkId = default;
             Optional<DataFactoryElement<string>> subnetName = default;
             Optional<DataFactoryCredentialReference> credential = default;
-            IDictionary<string, BinaryData> additionalProperties = default;
-            Dictionary<string, BinaryData> additionalPropertiesDictionary = new Dictionary<string, BinaryData>();
+            IDictionary<string, DataFactoryElement<string>> additionalProperties = default;
+            Dictionary<string, DataFactoryElement<string>> additionalPropertiesDictionary = new Dictionary<string, DataFactoryElement<string>>();
             foreach (var property in element.EnumerateObject())
             {
                 if (property.NameEquals("type"u8))
@@ -674,7 +674,7 @@ internal static HDInsightOnDemandLinkedService DeserializeHDInsightOnDemandLinke
                     }
                     continue;
                 }
-                additionalPropertiesDictionary.Add(property.Name, BinaryData.FromString(property.Value.GetRawText()));
+                additionalPropertiesDictionary.Add(property.Name, JsonSerializer.Deserialize<DataFactoryElement<string>>(property.Value.GetRawText()));
             }
             additionalProperties = additionalPropertiesDictionary;
             return new HDInsightOnDemandLinkedService(type, connectVia.Value, description.Value, Optional.ToDictionary(parameters), Optional.ToList(annotations), additionalProperties, clusterSize, timeToLive, version, linkedServiceName, hostSubscriptionId, servicePrincipalId.Value, servicePrincipalKey, tenant, clusterResourceGroup, clusterNamePrefix.Value, clusterUserName.Value, clusterPassword, clusterSshUserName.Value, clusterSshPassword, Optional.ToList(additionalLinkedServiceNames), hcatalogLinkedServiceName, clusterType.Value, sparkVersion.Value, coreConfiguration.Value, hBaseConfiguration.Value, hdfsConfiguration.Value, hiveConfiguration.Value, mapReduceConfiguration.Value, oozieConfiguration.Value, stormConfiguration.Value, yarnConfiguration.Value, encryptedCredential.Value, headNodeSize.Value, dataNodeSize.Value, zookeeperNodeSize.Value, Optional.ToList(scriptActions), virtualNetworkId.Value, subnetName.Value, credential.Value);
diff --git a/src/AzureDataFactory.TestingFramework/Generated/Models/HDInsightOnDemandLinkedService.cs b/src/AzureDataFactory.TestingFramework/Generated/Models/HDInsightOnDemandLinkedService.cs
index 58a3f565..1a7c4315 100644
--- a/src/AzureDataFactory.TestingFramework/Generated/Models/HDInsightOnDemandLinkedService.cs
+++ b/src/AzureDataFactory.TestingFramework/Generated/Models/HDInsightOnDemandLinkedService.cs
@@ -85,7 +85,7 @@ public HDInsightOnDemandLinkedService(DataFactoryElement<string> clusterSize, Da
         /// <param name="virtualNetworkId"> The ARM resource ID for the vNet to which the cluster should be joined after creation. Type: string (or Expression with resultType string). </param>
         /// <param name="subnetName"> The ARM resource ID for the subnet in the vNet. If virtualNetworkId was specified, then this property is required. Type: string (or Expression with resultType string). </param>
         /// <param name="credential"> The credential reference containing authentication information. </param>
-        internal HDInsightOnDemandLinkedService(string linkedServiceType, IntegrationRuntimeReference connectVia, string description, IDictionary<string, EntityParameterSpecification> parameters, IList<BinaryData> annotations, IDictionary<string, BinaryData> additionalProperties, DataFactoryElement<string> clusterSize, DataFactoryElement<string> timeToLiveExpression, DataFactoryElement<string> version, DataFactoryLinkedServiceReference linkedServiceName, DataFactoryElement<string> hostSubscriptionId, DataFactoryElement<string> servicePrincipalId, DataFactorySecretBaseDefinition servicePrincipalKey, DataFactoryElement<string> tenant, DataFactoryElement<string> clusterResourceGroup, DataFactoryElement<string> clusterNamePrefix, DataFactoryElement<string> clusterUserName, DataFactorySecretBaseDefinition clusterPassword, DataFactoryElement<string> clusterSshUserName, DataFactorySecretBaseDefinition clusterSshPassword, IList<DataFactoryLinkedServiceReference> additionalLinkedServiceNames, DataFactoryLinkedServiceReference hcatalogLinkedServiceName, DataFactoryElement<string> clusterType, DataFactoryElement<string> sparkVersion, BinaryData coreConfiguration, BinaryData hBaseConfiguration, BinaryData hdfsConfiguration, BinaryData hiveConfiguration, BinaryData mapReduceConfiguration, BinaryData oozieConfiguration, BinaryData stormConfiguration, BinaryData yarnConfiguration, string encryptedCredential, BinaryData headNodeSize, BinaryData dataNodeSize, BinaryData zookeeperNodeSize, IList<DataFactoryScriptAction> scriptActions, DataFactoryElement<string> virtualNetworkId, DataFactoryElement<string> subnetName, DataFactoryCredentialReference credential) : base(linkedServiceType, connectVia, description, parameters, annotations, additionalProperties)
+        internal HDInsightOnDemandLinkedService(string linkedServiceType, IntegrationRuntimeReference connectVia, string description, IDictionary<string, EntityParameterSpecification> parameters, IList<BinaryData> annotations, IDictionary<string, DataFactoryElement<string>> additionalProperties, DataFactoryElement<string> clusterSize, DataFactoryElement<string> timeToLiveExpression, DataFactoryElement<string> version, DataFactoryLinkedServiceReference linkedServiceName, DataFactoryElement<string> hostSubscriptionId, DataFactoryElement<string> servicePrincipalId, DataFactorySecretBaseDefinition servicePrincipalKey, DataFactoryElement<string> tenant, DataFactoryElement<string> clusterResourceGroup, DataFactoryElement<string> clusterNamePrefix, DataFactoryElement<string> clusterUserName, DataFactorySecretBaseDefinition clusterPassword, DataFactoryElement<string> clusterSshUserName, DataFactorySecretBaseDefinition clusterSshPassword, IList<DataFactoryLinkedServiceReference> additionalLinkedServiceNames, DataFactoryLinkedServiceReference hcatalogLinkedServiceName, DataFactoryElement<string> clusterType, DataFactoryElement<string> sparkVersion, BinaryData coreConfiguration, BinaryData hBaseConfiguration, BinaryData hdfsConfiguration, BinaryData hiveConfiguration, BinaryData mapReduceConfiguration, BinaryData oozieConfiguration, BinaryData stormConfiguration, BinaryData yarnConfiguration, string encryptedCredential, BinaryData headNodeSize, BinaryData dataNodeSize, BinaryData zookeeperNodeSize, IList<DataFactoryScriptAction> scriptActions, DataFactoryElement<string> virtualNetworkId, DataFactoryElement<string> subnetName, DataFactoryCredentialReference credential) : base(linkedServiceType, connectVia, description, parameters, annotations, additionalProperties)
         {
             ClusterSize = clusterSize;
             TimeToLiveExpression = timeToLiveExpression;
diff --git a/src/AzureDataFactory.TestingFramework/Generated/Models/HDInsightPigActivity.Serialization.cs b/src/AzureDataFactory.TestingFramework/Generated/Models/HDInsightPigActivity.Serialization.cs
index eb19fd07..961982f3 100644
--- a/src/AzureDataFactory.TestingFramework/Generated/Models/HDInsightPigActivity.Serialization.cs
+++ b/src/AzureDataFactory.TestingFramework/Generated/Models/HDInsightPigActivity.Serialization.cs
@@ -154,9 +154,9 @@ internal static HDInsightPigActivity DeserializeHDInsightPigActivity(JsonElement
             Optional<HDInsightActivityDebugInfoOptionSetting> getDebugInfo = default;
             Optional<DataFactoryElement<string>> scriptPath = default;
             Optional<DataFactoryLinkedServiceReference> scriptLinkedService = default;
-            Optional<IDictionary<string, BinaryData>> defines = default;
-            IDictionary<string, BinaryData> additionalProperties = default;
-            Dictionary<string, BinaryData> additionalPropertiesDictionary = new Dictionary<string, BinaryData>();
+            Optional<IDictionary<string, DataFactoryElement<string>>> defines = default;
+            IDictionary<string, DataFactoryElement<string>> additionalProperties = default;
+            Dictionary<string, DataFactoryElement<string>> additionalPropertiesDictionary = new Dictionary<string, DataFactoryElement<string>>();
             foreach (var property in element.EnumerateObject())
             {
                 if (property.NameEquals("linkedServiceName"u8))
@@ -303,7 +303,7 @@ internal static HDInsightPigActivity DeserializeHDInsightPigActivity(JsonElement
                             {
                                 continue;
                             }
-                            Dictionary<string, BinaryData> dictionary = new Dictionary<string, BinaryData>();
+                            Dictionary<string, DataFactoryElement<string>> dictionary = new Dictionary<string, DataFactoryElement<string>>();
                             foreach (var property1 in property0.Value.EnumerateObject())
                             {
                                 if (property1.Value.ValueKind == JsonValueKind.Null)
@@ -312,7 +312,7 @@ internal static HDInsightPigActivity DeserializeHDInsightPigActivity(JsonElement
                                 }
                                 else
                                 {
-                                    dictionary.Add(property1.Name, BinaryData.FromString(property1.Value.GetRawText()));
+                                    dictionary.Add(property1.Name, JsonSerializer.Deserialize<DataFactoryElement<string>>(property1.Value.GetRawText()));
                                 }
                             }
                             defines = dictionary;
@@ -321,7 +321,7 @@ internal static HDInsightPigActivity DeserializeHDInsightPigActivity(JsonElement
                     }
                     continue;
                 }
-                additionalPropertiesDictionary.Add(property.Name, BinaryData.FromString(property.Value.GetRawText()));
+                additionalPropertiesDictionary.Add(property.Name, JsonSerializer.Deserialize<DataFactoryElement<string>>(property.Value.GetRawText()));
             }
             additionalProperties = additionalPropertiesDictionary;
             return new HDInsightPigActivity(name, type, description.Value, Optional.ToNullable(state), Optional.ToNullable(onInactiveMarkAs), Optional.ToList(dependsOn), Optional.ToList(userProperties), additionalProperties, linkedServiceName, policy.Value, Optional.ToList(storageLinkedServices), arguments.Value, Optional.ToNullable(getDebugInfo), scriptPath.Value, scriptLinkedService, Optional.ToDictionary(defines));
diff --git a/src/AzureDataFactory.TestingFramework/Generated/Models/HDInsightPigActivity.cs b/src/AzureDataFactory.TestingFramework/Generated/Models/HDInsightPigActivity.cs
index 77523ec1..5a50f152 100644
--- a/src/AzureDataFactory.TestingFramework/Generated/Models/HDInsightPigActivity.cs
+++ b/src/AzureDataFactory.TestingFramework/Generated/Models/HDInsightPigActivity.cs
@@ -21,7 +21,7 @@ public HDInsightPigActivity(string name) : base(name)
             Argument.AssertNotNull(name, nameof(name));
 
             StorageLinkedServices = new ChangeTrackingList<DataFactoryLinkedServiceReference>();
-            Defines = new ChangeTrackingDictionary<string, BinaryData>();
+            Defines = new ChangeTrackingDictionary<string, DataFactoryElement<string>>();
             ActivityType = "HDInsightPig";
         }
 
@@ -42,7 +42,7 @@ public HDInsightPigActivity(string name) : base(name)
         /// <param name="scriptPath"> Script path. Type: string (or Expression with resultType string). </param>
         /// <param name="scriptLinkedService"> Script linked service reference. </param>
         /// <param name="defines"> Allows user to specify defines for Pig job request. </param>
-        internal HDInsightPigActivity(string name, string activityType, string description, PipelineActivityState? state, ActivityOnInactiveMarkAs? onInactiveMarkAs, IList<PipelineActivityDependency> dependsOn, IList<PipelineActivityUserProperty> userProperties, IDictionary<string, BinaryData> additionalProperties, DataFactoryLinkedServiceReference linkedServiceName, PipelineActivityPolicy policy, IList<DataFactoryLinkedServiceReference> storageLinkedServices, BinaryData arguments, HDInsightActivityDebugInfoOptionSetting? getDebugInfo, DataFactoryElement<string> scriptPath, DataFactoryLinkedServiceReference scriptLinkedService, IDictionary<string, BinaryData> defines) : base(name, activityType, description, state, onInactiveMarkAs, dependsOn, userProperties, additionalProperties, linkedServiceName, policy)
+        internal HDInsightPigActivity(string name, string activityType, string description, PipelineActivityState? state, ActivityOnInactiveMarkAs? onInactiveMarkAs, IList<PipelineActivityDependency> dependsOn, IList<PipelineActivityUserProperty> userProperties, IDictionary<string, DataFactoryElement<string>> additionalProperties, DataFactoryLinkedServiceReference linkedServiceName, PipelineActivityPolicy policy, IList<DataFactoryLinkedServiceReference> storageLinkedServices, BinaryData arguments, HDInsightActivityDebugInfoOptionSetting? getDebugInfo, DataFactoryElement<string> scriptPath, DataFactoryLinkedServiceReference scriptLinkedService, IDictionary<string, DataFactoryElement<string>> defines) : base(name, activityType, description, state, onInactiveMarkAs, dependsOn, userProperties, additionalProperties, linkedServiceName, policy)
         {
             StorageLinkedServices = storageLinkedServices;
             Arguments = arguments;
@@ -122,6 +122,6 @@ internal HDInsightPigActivity(string name, string activityType, string descripti
         /// </list>
         /// </para>
         /// </summary>
-        public IDictionary<string, BinaryData> Defines { get; }
+        public IDictionary<string, DataFactoryElement<string>> Defines { get; }
     }
 }
diff --git a/src/AzureDataFactory.TestingFramework/Generated/Models/HDInsightSparkActivity.Serialization.cs b/src/AzureDataFactory.TestingFramework/Generated/Models/HDInsightSparkActivity.Serialization.cs
index 8985b1a6..a2e01340 100644
--- a/src/AzureDataFactory.TestingFramework/Generated/Models/HDInsightSparkActivity.Serialization.cs
+++ b/src/AzureDataFactory.TestingFramework/Generated/Models/HDInsightSparkActivity.Serialization.cs
@@ -165,9 +165,9 @@ internal static HDInsightSparkActivity DeserializeHDInsightSparkActivity(JsonEle
             Optional<DataFactoryLinkedServiceReference> sparkJobLinkedService = default;
             Optional<string> className = default;
             Optional<DataFactoryElement<string>> proxyUser = default;
-            Optional<IDictionary<string, BinaryData>> sparkConfig = default;
-            IDictionary<string, BinaryData> additionalProperties = default;
-            Dictionary<string, BinaryData> additionalPropertiesDictionary = new Dictionary<string, BinaryData>();
+            Optional<IDictionary<string, DataFactoryElement<string>>> sparkConfig = default;
+            IDictionary<string, DataFactoryElement<string>> additionalProperties = default;
+            Dictionary<string, DataFactoryElement<string>> additionalPropertiesDictionary = new Dictionary<string, DataFactoryElement<string>>();
             foreach (var property in element.EnumerateObject())
             {
                 if (property.NameEquals("linkedServiceName"u8))
@@ -327,7 +327,7 @@ internal static HDInsightSparkActivity DeserializeHDInsightSparkActivity(JsonEle
                             {
                                 continue;
                             }
-                            Dictionary<string, BinaryData> dictionary = new Dictionary<string, BinaryData>();
+                            Dictionary<string, DataFactoryElement<string>> dictionary = new Dictionary<string, DataFactoryElement<string>>();
                             foreach (var property1 in property0.Value.EnumerateObject())
                             {
                                 if (property1.Value.ValueKind == JsonValueKind.Null)
@@ -336,7 +336,7 @@ internal static HDInsightSparkActivity DeserializeHDInsightSparkActivity(JsonEle
                                 }
                                 else
                                 {
-                                    dictionary.Add(property1.Name, BinaryData.FromString(property1.Value.GetRawText()));
+                                    dictionary.Add(property1.Name, JsonSerializer.Deserialize<DataFactoryElement<string>>(property1.Value.GetRawText()));
                                 }
                             }
                             sparkConfig = dictionary;
@@ -345,7 +345,7 @@ internal static HDInsightSparkActivity DeserializeHDInsightSparkActivity(JsonEle
                     }
                     continue;
                 }
-                additionalPropertiesDictionary.Add(property.Name, BinaryData.FromString(property.Value.GetRawText()));
+                additionalPropertiesDictionary.Add(property.Name, JsonSerializer.Deserialize<DataFactoryElement<string>>(property.Value.GetRawText()));
             }
             additionalProperties = additionalPropertiesDictionary;
             return new HDInsightSparkActivity(name, type, description.Value, Optional.ToNullable(state), Optional.ToNullable(onInactiveMarkAs), Optional.ToList(dependsOn), Optional.ToList(userProperties), additionalProperties, linkedServiceName, policy.Value, rootPath, entryFilePath, Optional.ToList(arguments), Optional.ToNullable(getDebugInfo), sparkJobLinkedService, className.Value, proxyUser.Value, Optional.ToDictionary(sparkConfig));
diff --git a/src/AzureDataFactory.TestingFramework/Generated/Models/HDInsightSparkActivity.cs b/src/AzureDataFactory.TestingFramework/Generated/Models/HDInsightSparkActivity.cs
index 1276d336..d436243c 100644
--- a/src/AzureDataFactory.TestingFramework/Generated/Models/HDInsightSparkActivity.cs
+++ b/src/AzureDataFactory.TestingFramework/Generated/Models/HDInsightSparkActivity.cs
@@ -27,7 +27,7 @@ public HDInsightSparkActivity(string name, DataFactoryElement<string> rootPath,
             RootPath = rootPath;
             EntryFilePath = entryFilePath;
             Arguments = new ChangeTrackingList<BinaryData>();
-            SparkConfig = new ChangeTrackingDictionary<string, BinaryData>();
+            SparkConfig = new ChangeTrackingDictionary<string, DataFactoryElement<string>>();
             ActivityType = "HDInsightSpark";
         }
 
@@ -50,7 +50,7 @@ public HDInsightSparkActivity(string name, DataFactoryElement<string> rootPath,
         /// <param name="className"> The application's Java/Spark main class. </param>
         /// <param name="proxyUser"> The user to impersonate that will execute the job. Type: string (or Expression with resultType string). </param>
         /// <param name="sparkConfig"> Spark configuration property. </param>
-        internal HDInsightSparkActivity(string name, string activityType, string description, PipelineActivityState? state, ActivityOnInactiveMarkAs? onInactiveMarkAs, IList<PipelineActivityDependency> dependsOn, IList<PipelineActivityUserProperty> userProperties, IDictionary<string, BinaryData> additionalProperties, DataFactoryLinkedServiceReference linkedServiceName, PipelineActivityPolicy policy, DataFactoryElement<string> rootPath, DataFactoryElement<string> entryFilePath, IList<BinaryData> arguments, HDInsightActivityDebugInfoOptionSetting? getDebugInfo, DataFactoryLinkedServiceReference sparkJobLinkedService, string className, DataFactoryElement<string> proxyUser, IDictionary<string, BinaryData> sparkConfig) : base(name, activityType, description, state, onInactiveMarkAs, dependsOn, userProperties, additionalProperties, linkedServiceName, policy)
+        internal HDInsightSparkActivity(string name, string activityType, string description, PipelineActivityState? state, ActivityOnInactiveMarkAs? onInactiveMarkAs, IList<PipelineActivityDependency> dependsOn, IList<PipelineActivityUserProperty> userProperties, IDictionary<string, DataFactoryElement<string>> additionalProperties, DataFactoryLinkedServiceReference linkedServiceName, PipelineActivityPolicy policy, DataFactoryElement<string> rootPath, DataFactoryElement<string> entryFilePath, IList<BinaryData> arguments, HDInsightActivityDebugInfoOptionSetting? getDebugInfo, DataFactoryLinkedServiceReference sparkJobLinkedService, string className, DataFactoryElement<string> proxyUser, IDictionary<string, DataFactoryElement<string>> sparkConfig) : base(name, activityType, description, state, onInactiveMarkAs, dependsOn, userProperties, additionalProperties, linkedServiceName, policy)
         {
             RootPath = rootPath;
             EntryFilePath = entryFilePath;
@@ -136,6 +136,6 @@ internal HDInsightSparkActivity(string name, string activityType, string descrip
         /// </list>
         /// </para>
         /// </summary>
-        public IDictionary<string, BinaryData> SparkConfig { get; }
+        public IDictionary<string, DataFactoryElement<string>> SparkConfig { get; }
     }
 }
diff --git a/src/AzureDataFactory.TestingFramework/Generated/Models/HDInsightStreamingActivity.Serialization.cs b/src/AzureDataFactory.TestingFramework/Generated/Models/HDInsightStreamingActivity.Serialization.cs
index 0152924b..85d77c10 100644
--- a/src/AzureDataFactory.TestingFramework/Generated/Models/HDInsightStreamingActivity.Serialization.cs
+++ b/src/AzureDataFactory.TestingFramework/Generated/Models/HDInsightStreamingActivity.Serialization.cs
@@ -213,9 +213,9 @@ internal static HDInsightStreamingActivity DeserializeHDInsightStreamingActivity
             Optional<DataFactoryLinkedServiceReference> fileLinkedService = default;
             Optional<DataFactoryElement<string>> combiner = default;
             Optional<IList<BinaryData>> commandEnvironment = default;
-            Optional<IDictionary<string, BinaryData>> defines = default;
-            IDictionary<string, BinaryData> additionalProperties = default;
-            Dictionary<string, BinaryData> additionalPropertiesDictionary = new Dictionary<string, BinaryData>();
+            Optional<IDictionary<string, DataFactoryElement<string>>> defines = default;
+            IDictionary<string, DataFactoryElement<string>> additionalProperties = default;
+            Dictionary<string, DataFactoryElement<string>> additionalPropertiesDictionary = new Dictionary<string, DataFactoryElement<string>>();
             foreach (var property in element.EnumerateObject())
             {
                 if (property.NameEquals("linkedServiceName"u8))
@@ -432,7 +432,7 @@ internal static HDInsightStreamingActivity DeserializeHDInsightStreamingActivity
                             {
                                 continue;
                             }
-                            Dictionary<string, BinaryData> dictionary = new Dictionary<string, BinaryData>();
+                            Dictionary<string, DataFactoryElement<string>> dictionary = new Dictionary<string, DataFactoryElement<string>>();
                             foreach (var property1 in property0.Value.EnumerateObject())
                             {
                                 if (property1.Value.ValueKind == JsonValueKind.Null)
@@ -441,7 +441,7 @@ internal static HDInsightStreamingActivity DeserializeHDInsightStreamingActivity
                                 }
                                 else
                                 {
-                                    dictionary.Add(property1.Name, BinaryData.FromString(property1.Value.GetRawText()));
+                                    dictionary.Add(property1.Name, JsonSerializer.Deserialize<DataFactoryElement<string>>(property1.Value.GetRawText()));
                                 }
                             }
                             defines = dictionary;
@@ -450,7 +450,7 @@ internal static HDInsightStreamingActivity DeserializeHDInsightStreamingActivity
                     }
                     continue;
                 }
-                additionalPropertiesDictionary.Add(property.Name, BinaryData.FromString(property.Value.GetRawText()));
+                additionalPropertiesDictionary.Add(property.Name, JsonSerializer.Deserialize<DataFactoryElement<string>>(property.Value.GetRawText()));
             }
             additionalProperties = additionalPropertiesDictionary;
             return new HDInsightStreamingActivity(name, type, description.Value, Optional.ToNullable(state), Optional.ToNullable(onInactiveMarkAs), Optional.ToList(dependsOn), Optional.ToList(userProperties), additionalProperties, linkedServiceName, policy.Value, Optional.ToList(storageLinkedServices), Optional.ToList(arguments), Optional.ToNullable(getDebugInfo), mapper, reducer, input, output, filePaths, fileLinkedService, combiner.Value, Optional.ToList(commandEnvironment), Optional.ToDictionary(defines));
diff --git a/src/AzureDataFactory.TestingFramework/Generated/Models/HDInsightStreamingActivity.cs b/src/AzureDataFactory.TestingFramework/Generated/Models/HDInsightStreamingActivity.cs
index c6cd444b..12a97800 100644
--- a/src/AzureDataFactory.TestingFramework/Generated/Models/HDInsightStreamingActivity.cs
+++ b/src/AzureDataFactory.TestingFramework/Generated/Models/HDInsightStreamingActivity.cs
@@ -38,7 +38,7 @@ public HDInsightStreamingActivity(string name, DataFactoryElement<string> mapper
             Output = output;
             FilePaths = filePaths.ToList();
             CommandEnvironment = new ChangeTrackingList<BinaryData>();
-            Defines = new ChangeTrackingDictionary<string, BinaryData>();
+            Defines = new ChangeTrackingDictionary<string, DataFactoryElement<string>>();
             ActivityType = "HDInsightStreaming";
         }
 
@@ -65,7 +65,7 @@ public HDInsightStreamingActivity(string name, DataFactoryElement<string> mapper
         /// <param name="combiner"> Combiner executable name. Type: string (or Expression with resultType string). </param>
         /// <param name="commandEnvironment"> Command line environment values. </param>
         /// <param name="defines"> Allows user to specify defines for streaming job request. </param>
-        internal HDInsightStreamingActivity(string name, string activityType, string description, PipelineActivityState? state, ActivityOnInactiveMarkAs? onInactiveMarkAs, IList<PipelineActivityDependency> dependsOn, IList<PipelineActivityUserProperty> userProperties, IDictionary<string, BinaryData> additionalProperties, DataFactoryLinkedServiceReference linkedServiceName, PipelineActivityPolicy policy, IList<DataFactoryLinkedServiceReference> storageLinkedServices, IList<BinaryData> arguments, HDInsightActivityDebugInfoOptionSetting? getDebugInfo, DataFactoryElement<string> mapper, DataFactoryElement<string> reducer, DataFactoryElement<string> input, DataFactoryElement<string> output, IList<BinaryData> filePaths, DataFactoryLinkedServiceReference fileLinkedService, DataFactoryElement<string> combiner, IList<BinaryData> commandEnvironment, IDictionary<string, BinaryData> defines) : base(name, activityType, description, state, onInactiveMarkAs, dependsOn, userProperties, additionalProperties, linkedServiceName, policy)
+        internal HDInsightStreamingActivity(string name, string activityType, string description, PipelineActivityState? state, ActivityOnInactiveMarkAs? onInactiveMarkAs, IList<PipelineActivityDependency> dependsOn, IList<PipelineActivityUserProperty> userProperties, IDictionary<string, DataFactoryElement<string>> additionalProperties, DataFactoryLinkedServiceReference linkedServiceName, PipelineActivityPolicy policy, IList<DataFactoryLinkedServiceReference> storageLinkedServices, IList<BinaryData> arguments, HDInsightActivityDebugInfoOptionSetting? getDebugInfo, DataFactoryElement<string> mapper, DataFactoryElement<string> reducer, DataFactoryElement<string> input, DataFactoryElement<string> output, IList<BinaryData> filePaths, DataFactoryLinkedServiceReference fileLinkedService, DataFactoryElement<string> combiner, IList<BinaryData> commandEnvironment, IDictionary<string, DataFactoryElement<string>> defines) : base(name, activityType, description, state, onInactiveMarkAs, dependsOn, userProperties, additionalProperties, linkedServiceName, policy)
         {
             StorageLinkedServices = storageLinkedServices;
             Arguments = arguments;
@@ -221,6 +221,6 @@ internal HDInsightStreamingActivity(string name, string activityType, string des
         /// </list>
         /// </para>
         /// </summary>
-        public IDictionary<string, BinaryData> Defines { get; }
+        public IDictionary<string, DataFactoryElement<string>> Defines { get; }
     }
 }
diff --git a/src/AzureDataFactory.TestingFramework/Generated/Models/HdfsLinkedService.Serialization.cs b/src/AzureDataFactory.TestingFramework/Generated/Models/HdfsLinkedService.Serialization.cs
index 231f335a..30ec2c8d 100644
--- a/src/AzureDataFactory.TestingFramework/Generated/Models/HdfsLinkedService.Serialization.cs
+++ b/src/AzureDataFactory.TestingFramework/Generated/Models/HdfsLinkedService.Serialization.cs
@@ -111,8 +111,8 @@ internal static HdfsLinkedService DeserializeHdfsLinkedService(JsonElement eleme
             Optional<string> encryptedCredential = default;
             Optional<DataFactoryElement<string>> userName = default;
             Optional<DataFactorySecretBaseDefinition> password = default;
-            IDictionary<string, BinaryData> additionalProperties = default;
-            Dictionary<string, BinaryData> additionalPropertiesDictionary = new Dictionary<string, BinaryData>();
+            IDictionary<string, DataFactoryElement<string>> additionalProperties = default;
+            Dictionary<string, DataFactoryElement<string>> additionalPropertiesDictionary = new Dictionary<string, DataFactoryElement<string>>();
             foreach (var property in element.EnumerateObject())
             {
                 if (property.NameEquals("type"u8))
@@ -218,7 +218,7 @@ internal static HdfsLinkedService DeserializeHdfsLinkedService(JsonElement eleme
                     }
                     continue;
                 }
-                additionalPropertiesDictionary.Add(property.Name, BinaryData.FromString(property.Value.GetRawText()));
+                additionalPropertiesDictionary.Add(property.Name, JsonSerializer.Deserialize<DataFactoryElement<string>>(property.Value.GetRawText()));
             }
             additionalProperties = additionalPropertiesDictionary;
             return new HdfsLinkedService(type, connectVia.Value, description.Value, Optional.ToDictionary(parameters), Optional.ToList(annotations), additionalProperties, url, authenticationType.Value, encryptedCredential.Value, userName.Value, password);
diff --git a/src/AzureDataFactory.TestingFramework/Generated/Models/HdfsLinkedService.cs b/src/AzureDataFactory.TestingFramework/Generated/Models/HdfsLinkedService.cs
index 28a4a549..8bab371c 100644
--- a/src/AzureDataFactory.TestingFramework/Generated/Models/HdfsLinkedService.cs
+++ b/src/AzureDataFactory.TestingFramework/Generated/Models/HdfsLinkedService.cs
@@ -36,7 +36,7 @@ public HdfsLinkedService(DataFactoryElement<string> uri)
         /// <param name="encryptedCredential"> The encrypted credential used for authentication. Credentials are encrypted using the integration runtime credential manager. Type: string. </param>
         /// <param name="userName"> User name for Windows authentication. Type: string (or Expression with resultType string). </param>
         /// <param name="password"> Password for Windows authentication. </param>
-        internal HdfsLinkedService(string linkedServiceType, IntegrationRuntimeReference connectVia, string description, IDictionary<string, EntityParameterSpecification> parameters, IList<BinaryData> annotations, IDictionary<string, BinaryData> additionalProperties, DataFactoryElement<string> uri, DataFactoryElement<string> authenticationType, string encryptedCredential, DataFactoryElement<string> userName, DataFactorySecretBaseDefinition password) : base(linkedServiceType, connectVia, description, parameters, annotations, additionalProperties)
+        internal HdfsLinkedService(string linkedServiceType, IntegrationRuntimeReference connectVia, string description, IDictionary<string, EntityParameterSpecification> parameters, IList<BinaryData> annotations, IDictionary<string, DataFactoryElement<string>> additionalProperties, DataFactoryElement<string> uri, DataFactoryElement<string> authenticationType, string encryptedCredential, DataFactoryElement<string> userName, DataFactorySecretBaseDefinition password) : base(linkedServiceType, connectVia, description, parameters, annotations, additionalProperties)
         {
             Uri = uri;
             AuthenticationType = authenticationType;
diff --git a/src/AzureDataFactory.TestingFramework/Generated/Models/HdfsLocation.Serialization.cs b/src/AzureDataFactory.TestingFramework/Generated/Models/HdfsLocation.Serialization.cs
index 7a2ccd55..80b0de47 100644
--- a/src/AzureDataFactory.TestingFramework/Generated/Models/HdfsLocation.Serialization.cs
+++ b/src/AzureDataFactory.TestingFramework/Generated/Models/HdfsLocation.Serialization.cs
@@ -49,8 +49,8 @@ internal static HdfsLocation DeserializeHdfsLocation(JsonElement element)
             string type = default;
             Optional<DataFactoryElement<string>> folderPath = default;
             Optional<DataFactoryElement<string>> fileName = default;
-            IDictionary<string, BinaryData> additionalProperties = default;
-            Dictionary<string, BinaryData> additionalPropertiesDictionary = new Dictionary<string, BinaryData>();
+            IDictionary<string, DataFactoryElement<string>> additionalProperties = default;
+            Dictionary<string, DataFactoryElement<string>> additionalPropertiesDictionary = new Dictionary<string, DataFactoryElement<string>>();
             foreach (var property in element.EnumerateObject())
             {
                 if (property.NameEquals("type"u8))
@@ -76,7 +76,7 @@ internal static HdfsLocation DeserializeHdfsLocation(JsonElement element)
                     fileName = JsonSerializer.Deserialize<DataFactoryElement<string>>(property.Value.GetRawText());
                     continue;
                 }
-                additionalPropertiesDictionary.Add(property.Name, BinaryData.FromString(property.Value.GetRawText()));
+                additionalPropertiesDictionary.Add(property.Name, JsonSerializer.Deserialize<DataFactoryElement<string>>(property.Value.GetRawText()));
             }
             additionalProperties = additionalPropertiesDictionary;
             return new HdfsLocation(type, folderPath.Value, fileName.Value, additionalProperties);
diff --git a/src/AzureDataFactory.TestingFramework/Generated/Models/HdfsLocation.cs b/src/AzureDataFactory.TestingFramework/Generated/Models/HdfsLocation.cs
index 66fe7749..62a5c052 100644
--- a/src/AzureDataFactory.TestingFramework/Generated/Models/HdfsLocation.cs
+++ b/src/AzureDataFactory.TestingFramework/Generated/Models/HdfsLocation.cs
@@ -23,7 +23,7 @@ public HdfsLocation()
         /// <param name="folderPath"> Specify the folder path of dataset. Type: string (or Expression with resultType string). </param>
         /// <param name="fileName"> Specify the file name of dataset. Type: string (or Expression with resultType string). </param>
         /// <param name="additionalProperties"> Additional Properties. </param>
-        internal HdfsLocation(string datasetLocationType, DataFactoryElement<string> folderPath, DataFactoryElement<string> fileName, IDictionary<string, BinaryData> additionalProperties) : base(datasetLocationType, folderPath, fileName, additionalProperties)
+        internal HdfsLocation(string datasetLocationType, DataFactoryElement<string> folderPath, DataFactoryElement<string> fileName, IDictionary<string, DataFactoryElement<string>> additionalProperties) : base(datasetLocationType, folderPath, fileName, additionalProperties)
         {
             DatasetLocationType = datasetLocationType ?? "HdfsLocation";
         }
diff --git a/src/AzureDataFactory.TestingFramework/Generated/Models/HdfsReadSettings.Serialization.cs b/src/AzureDataFactory.TestingFramework/Generated/Models/HdfsReadSettings.Serialization.cs
index ebbf0cec..8906fb68 100644
--- a/src/AzureDataFactory.TestingFramework/Generated/Models/HdfsReadSettings.Serialization.cs
+++ b/src/AzureDataFactory.TestingFramework/Generated/Models/HdfsReadSettings.Serialization.cs
@@ -109,8 +109,8 @@ internal static HdfsReadSettings DeserializeHdfsReadSettings(JsonElement element
             string type = default;
             Optional<DataFactoryElement<int>> maxConcurrentConnections = default;
             Optional<DataFactoryElement<bool>> disableMetricsCollection = default;
-            IDictionary<string, BinaryData> additionalProperties = default;
-            Dictionary<string, BinaryData> additionalPropertiesDictionary = new Dictionary<string, BinaryData>();
+            IDictionary<string, DataFactoryElement<string>> additionalProperties = default;
+            Dictionary<string, DataFactoryElement<string>> additionalPropertiesDictionary = new Dictionary<string, DataFactoryElement<string>>();
             foreach (var property in element.EnumerateObject())
             {
                 if (property.NameEquals("recursive"u8))
@@ -226,7 +226,7 @@ internal static HdfsReadSettings DeserializeHdfsReadSettings(JsonElement element
                     disableMetricsCollection = JsonSerializer.Deserialize<DataFactoryElement<bool>>(property.Value.GetRawText());
                     continue;
                 }
-                additionalPropertiesDictionary.Add(property.Name, BinaryData.FromString(property.Value.GetRawText()));
+                additionalPropertiesDictionary.Add(property.Name, JsonSerializer.Deserialize<DataFactoryElement<string>>(property.Value.GetRawText()));
             }
             additionalProperties = additionalPropertiesDictionary;
             return new HdfsReadSettings(type, maxConcurrentConnections.Value, disableMetricsCollection.Value, additionalProperties, recursive.Value, wildcardFolderPath.Value, wildcardFileName.Value, fileListPath.Value, enablePartitionDiscovery.Value, partitionRootPath.Value, modifiedDatetimeStart.Value, modifiedDatetimeEnd.Value, distcpSettings.Value, deleteFilesAfterCompletion.Value);
diff --git a/src/AzureDataFactory.TestingFramework/Generated/Models/HdfsReadSettings.cs b/src/AzureDataFactory.TestingFramework/Generated/Models/HdfsReadSettings.cs
index 636990f4..a984ebdf 100644
--- a/src/AzureDataFactory.TestingFramework/Generated/Models/HdfsReadSettings.cs
+++ b/src/AzureDataFactory.TestingFramework/Generated/Models/HdfsReadSettings.cs
@@ -33,7 +33,7 @@ public HdfsReadSettings()
         /// <param name="modifiedDatetimeEnd"> The end of file's modified datetime. Type: string (or Expression with resultType string). </param>
         /// <param name="distcpSettings"> Specifies Distcp-related settings. </param>
         /// <param name="deleteFilesAfterCompletion"> Indicates whether the source files need to be deleted after copy completion. Default is false. Type: boolean (or Expression with resultType boolean). </param>
-        internal HdfsReadSettings(string storeReadSettingsType, DataFactoryElement<int> maxConcurrentConnections, DataFactoryElement<bool> disableMetricsCollection, IDictionary<string, BinaryData> additionalProperties, DataFactoryElement<bool> recursive, DataFactoryElement<string> wildcardFolderPath, DataFactoryElement<string> wildcardFileName, DataFactoryElement<string> fileListPath, DataFactoryElement<bool> enablePartitionDiscovery, DataFactoryElement<string> partitionRootPath, DataFactoryElement<string> modifiedDatetimeStart, DataFactoryElement<string> modifiedDatetimeEnd, DistcpSettings distcpSettings, DataFactoryElement<bool> deleteFilesAfterCompletion) : base(storeReadSettingsType, maxConcurrentConnections, disableMetricsCollection, additionalProperties)
+        internal HdfsReadSettings(string storeReadSettingsType, DataFactoryElement<int> maxConcurrentConnections, DataFactoryElement<bool> disableMetricsCollection, IDictionary<string, DataFactoryElement<string>> additionalProperties, DataFactoryElement<bool> recursive, DataFactoryElement<string> wildcardFolderPath, DataFactoryElement<string> wildcardFileName, DataFactoryElement<string> fileListPath, DataFactoryElement<bool> enablePartitionDiscovery, DataFactoryElement<string> partitionRootPath, DataFactoryElement<string> modifiedDatetimeStart, DataFactoryElement<string> modifiedDatetimeEnd, DistcpSettings distcpSettings, DataFactoryElement<bool> deleteFilesAfterCompletion) : base(storeReadSettingsType, maxConcurrentConnections, disableMetricsCollection, additionalProperties)
         {
             Recursive = recursive;
             WildcardFolderPath = wildcardFolderPath;
diff --git a/src/AzureDataFactory.TestingFramework/Generated/Models/HdfsSource.Serialization.cs b/src/AzureDataFactory.TestingFramework/Generated/Models/HdfsSource.Serialization.cs
index 48ac8c37..96da1e0e 100644
--- a/src/AzureDataFactory.TestingFramework/Generated/Models/HdfsSource.Serialization.cs
+++ b/src/AzureDataFactory.TestingFramework/Generated/Models/HdfsSource.Serialization.cs
@@ -73,8 +73,8 @@ internal static HdfsSource DeserializeHdfsSource(JsonElement element)
             Optional<DataFactoryElement<string>> sourceRetryWait = default;
             Optional<DataFactoryElement<int>> maxConcurrentConnections = default;
             Optional<DataFactoryElement<bool>> disableMetricsCollection = default;
-            IDictionary<string, BinaryData> additionalProperties = default;
-            Dictionary<string, BinaryData> additionalPropertiesDictionary = new Dictionary<string, BinaryData>();
+            IDictionary<string, DataFactoryElement<string>> additionalProperties = default;
+            Dictionary<string, DataFactoryElement<string>> additionalPropertiesDictionary = new Dictionary<string, DataFactoryElement<string>>();
             foreach (var property in element.EnumerateObject())
             {
                 if (property.NameEquals("recursive"u8))
@@ -136,7 +136,7 @@ internal static HdfsSource DeserializeHdfsSource(JsonElement element)
                     disableMetricsCollection = JsonSerializer.Deserialize<DataFactoryElement<bool>>(property.Value.GetRawText());
                     continue;
                 }
-                additionalPropertiesDictionary.Add(property.Name, BinaryData.FromString(property.Value.GetRawText()));
+                additionalPropertiesDictionary.Add(property.Name, JsonSerializer.Deserialize<DataFactoryElement<string>>(property.Value.GetRawText()));
             }
             additionalProperties = additionalPropertiesDictionary;
             return new HdfsSource(type, sourceRetryCount.Value, sourceRetryWait.Value, maxConcurrentConnections.Value, disableMetricsCollection.Value, additionalProperties, recursive.Value, distcpSettings.Value);
diff --git a/src/AzureDataFactory.TestingFramework/Generated/Models/HdfsSource.cs b/src/AzureDataFactory.TestingFramework/Generated/Models/HdfsSource.cs
index 4b4057ee..c3901fa4 100644
--- a/src/AzureDataFactory.TestingFramework/Generated/Models/HdfsSource.cs
+++ b/src/AzureDataFactory.TestingFramework/Generated/Models/HdfsSource.cs
@@ -27,7 +27,7 @@ public HdfsSource()
         /// <param name="additionalProperties"> Additional Properties. </param>
         /// <param name="recursive"> If true, files under the folder path will be read recursively. Default is true. Type: boolean (or Expression with resultType boolean). </param>
         /// <param name="distcpSettings"> Specifies Distcp-related settings. </param>
-        internal HdfsSource(string copySourceType, DataFactoryElement<int> sourceRetryCount, DataFactoryElement<string> sourceRetryWait, DataFactoryElement<int> maxConcurrentConnections, DataFactoryElement<bool> disableMetricsCollection, IDictionary<string, BinaryData> additionalProperties, DataFactoryElement<bool> recursive, DistcpSettings distcpSettings) : base(copySourceType, sourceRetryCount, sourceRetryWait, maxConcurrentConnections, disableMetricsCollection, additionalProperties)
+        internal HdfsSource(string copySourceType, DataFactoryElement<int> sourceRetryCount, DataFactoryElement<string> sourceRetryWait, DataFactoryElement<int> maxConcurrentConnections, DataFactoryElement<bool> disableMetricsCollection, IDictionary<string, DataFactoryElement<string>> additionalProperties, DataFactoryElement<bool> recursive, DistcpSettings distcpSettings) : base(copySourceType, sourceRetryCount, sourceRetryWait, maxConcurrentConnections, disableMetricsCollection, additionalProperties)
         {
             Recursive = recursive;
             DistcpSettings = distcpSettings;
diff --git a/src/AzureDataFactory.TestingFramework/Generated/Models/HiveLinkedService.Serialization.cs b/src/AzureDataFactory.TestingFramework/Generated/Models/HiveLinkedService.Serialization.cs
index a63d892f..33b75755 100644
--- a/src/AzureDataFactory.TestingFramework/Generated/Models/HiveLinkedService.Serialization.cs
+++ b/src/AzureDataFactory.TestingFramework/Generated/Models/HiveLinkedService.Serialization.cs
@@ -180,8 +180,8 @@ internal static HiveLinkedService DeserializeHiveLinkedService(JsonElement eleme
             Optional<DataFactoryElement<bool>> allowHostNameCNMismatch = default;
             Optional<DataFactoryElement<bool>> allowSelfSignedServerCert = default;
             Optional<string> encryptedCredential = default;
-            IDictionary<string, BinaryData> additionalProperties = default;
-            Dictionary<string, BinaryData> additionalPropertiesDictionary = new Dictionary<string, BinaryData>();
+            IDictionary<string, DataFactoryElement<string>> additionalProperties = default;
+            Dictionary<string, DataFactoryElement<string>> additionalPropertiesDictionary = new Dictionary<string, DataFactoryElement<string>>();
             foreach (var property in element.EnumerateObject())
             {
                 if (property.NameEquals("type"u8))
@@ -391,7 +391,7 @@ internal static HiveLinkedService DeserializeHiveLinkedService(JsonElement eleme
                     }
                     continue;
                 }
-                additionalPropertiesDictionary.Add(property.Name, BinaryData.FromString(property.Value.GetRawText()));
+                additionalPropertiesDictionary.Add(property.Name, JsonSerializer.Deserialize<DataFactoryElement<string>>(property.Value.GetRawText()));
             }
             additionalProperties = additionalPropertiesDictionary;
             return new HiveLinkedService(type, connectVia.Value, description.Value, Optional.ToDictionary(parameters), Optional.ToList(annotations), additionalProperties, host, port.Value, Optional.ToNullable(serverType), Optional.ToNullable(thriftTransportProtocol), authenticationType, serviceDiscoveryMode.Value, zooKeeperNameSpace.Value, useNativeQuery.Value, username.Value, password, httpPath.Value, enableSsl.Value, trustedCertPath.Value, useSystemTrustStore.Value, allowHostNameCNMismatch.Value, allowSelfSignedServerCert.Value, encryptedCredential.Value);
diff --git a/src/AzureDataFactory.TestingFramework/Generated/Models/HiveLinkedService.cs b/src/AzureDataFactory.TestingFramework/Generated/Models/HiveLinkedService.cs
index 302f35a5..f2b1a606 100644
--- a/src/AzureDataFactory.TestingFramework/Generated/Models/HiveLinkedService.cs
+++ b/src/AzureDataFactory.TestingFramework/Generated/Models/HiveLinkedService.cs
@@ -50,7 +50,7 @@ public HiveLinkedService(DataFactoryElement<string> host, HiveAuthenticationType
         /// <param name="allowHostNameCNMismatch"> Specifies whether to require a CA-issued SSL certificate name to match the host name of the server when connecting over SSL. The default value is false. </param>
         /// <param name="allowSelfSignedServerCert"> Specifies whether to allow self-signed certificates from the server. The default value is false. </param>
         /// <param name="encryptedCredential"> The encrypted credential used for authentication. Credentials are encrypted using the integration runtime credential manager. Type: string. </param>
-        internal HiveLinkedService(string linkedServiceType, IntegrationRuntimeReference connectVia, string description, IDictionary<string, EntityParameterSpecification> parameters, IList<BinaryData> annotations, IDictionary<string, BinaryData> additionalProperties, DataFactoryElement<string> host, DataFactoryElement<int> port, HiveServerType? serverType, HiveThriftTransportProtocol? thriftTransportProtocol, HiveAuthenticationType authenticationType, DataFactoryElement<bool> serviceDiscoveryMode, DataFactoryElement<string> zooKeeperNameSpace, DataFactoryElement<bool> useNativeQuery, DataFactoryElement<string> username, DataFactorySecretBaseDefinition password, DataFactoryElement<string> httpPath, DataFactoryElement<bool> enableSsl, DataFactoryElement<string> trustedCertPath, DataFactoryElement<bool> useSystemTrustStore, DataFactoryElement<bool> allowHostNameCNMismatch, DataFactoryElement<bool> allowSelfSignedServerCert, string encryptedCredential) : base(linkedServiceType, connectVia, description, parameters, annotations, additionalProperties)
+        internal HiveLinkedService(string linkedServiceType, IntegrationRuntimeReference connectVia, string description, IDictionary<string, EntityParameterSpecification> parameters, IList<BinaryData> annotations, IDictionary<string, DataFactoryElement<string>> additionalProperties, DataFactoryElement<string> host, DataFactoryElement<int> port, HiveServerType? serverType, HiveThriftTransportProtocol? thriftTransportProtocol, HiveAuthenticationType authenticationType, DataFactoryElement<bool> serviceDiscoveryMode, DataFactoryElement<string> zooKeeperNameSpace, DataFactoryElement<bool> useNativeQuery, DataFactoryElement<string> username, DataFactorySecretBaseDefinition password, DataFactoryElement<string> httpPath, DataFactoryElement<bool> enableSsl, DataFactoryElement<string> trustedCertPath, DataFactoryElement<bool> useSystemTrustStore, DataFactoryElement<bool> allowHostNameCNMismatch, DataFactoryElement<bool> allowSelfSignedServerCert, string encryptedCredential) : base(linkedServiceType, connectVia, description, parameters, annotations, additionalProperties)
         {
             Host = host;
             Port = port;
diff --git a/src/AzureDataFactory.TestingFramework/Generated/Models/HiveObjectDataset.Serialization.cs b/src/AzureDataFactory.TestingFramework/Generated/Models/HiveObjectDataset.Serialization.cs
index 7dfed765..0d735dcc 100644
--- a/src/AzureDataFactory.TestingFramework/Generated/Models/HiveObjectDataset.Serialization.cs
+++ b/src/AzureDataFactory.TestingFramework/Generated/Models/HiveObjectDataset.Serialization.cs
@@ -120,8 +120,8 @@ internal static HiveObjectDataset DeserializeHiveObjectDataset(JsonElement eleme
             Optional<BinaryData> tableName = default;
             Optional<DataFactoryElement<string>> table = default;
             Optional<DataFactoryElement<string>> schema0 = default;
-            IDictionary<string, BinaryData> additionalProperties = default;
-            Dictionary<string, BinaryData> additionalPropertiesDictionary = new Dictionary<string, BinaryData>();
+            IDictionary<string, DataFactoryElement<string>> additionalProperties = default;
+            Dictionary<string, DataFactoryElement<string>> additionalPropertiesDictionary = new Dictionary<string, DataFactoryElement<string>>();
             foreach (var property in element.EnumerateObject())
             {
                 if (property.NameEquals("type"u8))
@@ -240,7 +240,7 @@ internal static HiveObjectDataset DeserializeHiveObjectDataset(JsonElement eleme
                     }
                     continue;
                 }
-                additionalPropertiesDictionary.Add(property.Name, BinaryData.FromString(property.Value.GetRawText()));
+                additionalPropertiesDictionary.Add(property.Name, JsonSerializer.Deserialize<DataFactoryElement<string>>(property.Value.GetRawText()));
             }
             additionalProperties = additionalPropertiesDictionary;
             return new HiveObjectDataset(type, description.Value, structure.Value, schema.Value, linkedServiceName, Optional.ToDictionary(parameters), Optional.ToList(annotations), folder.Value, additionalProperties, tableName.Value, table.Value, schema0.Value);
diff --git a/src/AzureDataFactory.TestingFramework/Generated/Models/HiveObjectDataset.cs b/src/AzureDataFactory.TestingFramework/Generated/Models/HiveObjectDataset.cs
index 4749fbda..6ded8df6 100644
--- a/src/AzureDataFactory.TestingFramework/Generated/Models/HiveObjectDataset.cs
+++ b/src/AzureDataFactory.TestingFramework/Generated/Models/HiveObjectDataset.cs
@@ -36,7 +36,7 @@ public HiveObjectDataset(DataFactoryLinkedServiceReference linkedServiceName) :
         /// <param name="tableName"> This property will be retired. Please consider using schema + table properties instead. </param>
         /// <param name="table"> The table name of the Hive. Type: string (or Expression with resultType string). </param>
         /// <param name="schemaTypePropertiesSchema"> The schema name of the Hive. Type: string (or Expression with resultType string). </param>
-        internal HiveObjectDataset(string datasetType, string description, DataFactoryElement<IList<DatasetDataElement>> structure, DataFactoryElement<IList<DatasetSchemaDataElement>> schema, DataFactoryLinkedServiceReference linkedServiceName, IDictionary<string, EntityParameterSpecification> parameters, IList<BinaryData> annotations, DatasetFolder folder, IDictionary<string, BinaryData> additionalProperties, BinaryData tableName, DataFactoryElement<string> table, DataFactoryElement<string> schemaTypePropertiesSchema) : base(datasetType, description, structure, schema, linkedServiceName, parameters, annotations, folder, additionalProperties)
+        internal HiveObjectDataset(string datasetType, string description, DataFactoryElement<IList<DatasetDataElement>> structure, DataFactoryElement<IList<DatasetSchemaDataElement>> schema, DataFactoryLinkedServiceReference linkedServiceName, IDictionary<string, EntityParameterSpecification> parameters, IList<BinaryData> annotations, DatasetFolder folder, IDictionary<string, DataFactoryElement<string>> additionalProperties, BinaryData tableName, DataFactoryElement<string> table, DataFactoryElement<string> schemaTypePropertiesSchema) : base(datasetType, description, structure, schema, linkedServiceName, parameters, annotations, folder, additionalProperties)
         {
             TableName = tableName;
             Table = table;
diff --git a/src/AzureDataFactory.TestingFramework/Generated/Models/HiveSource.Serialization.cs b/src/AzureDataFactory.TestingFramework/Generated/Models/HiveSource.Serialization.cs
index 08563452..18d3ecb6 100644
--- a/src/AzureDataFactory.TestingFramework/Generated/Models/HiveSource.Serialization.cs
+++ b/src/AzureDataFactory.TestingFramework/Generated/Models/HiveSource.Serialization.cs
@@ -83,8 +83,8 @@ internal static HiveSource DeserializeHiveSource(JsonElement element)
             Optional<DataFactoryElement<string>> sourceRetryWait = default;
             Optional<DataFactoryElement<int>> maxConcurrentConnections = default;
             Optional<DataFactoryElement<bool>> disableMetricsCollection = default;
-            IDictionary<string, BinaryData> additionalProperties = default;
-            Dictionary<string, BinaryData> additionalPropertiesDictionary = new Dictionary<string, BinaryData>();
+            IDictionary<string, DataFactoryElement<string>> additionalProperties = default;
+            Dictionary<string, DataFactoryElement<string>> additionalPropertiesDictionary = new Dictionary<string, DataFactoryElement<string>>();
             foreach (var property in element.EnumerateObject())
             {
                 if (property.NameEquals("query"u8))
@@ -155,7 +155,7 @@ internal static HiveSource DeserializeHiveSource(JsonElement element)
                     disableMetricsCollection = JsonSerializer.Deserialize<DataFactoryElement<bool>>(property.Value.GetRawText());
                     continue;
                 }
-                additionalPropertiesDictionary.Add(property.Name, BinaryData.FromString(property.Value.GetRawText()));
+                additionalPropertiesDictionary.Add(property.Name, JsonSerializer.Deserialize<DataFactoryElement<string>>(property.Value.GetRawText()));
             }
             additionalProperties = additionalPropertiesDictionary;
             return new HiveSource(type, sourceRetryCount.Value, sourceRetryWait.Value, maxConcurrentConnections.Value, disableMetricsCollection.Value, additionalProperties, queryTimeout.Value, additionalColumns.Value, query.Value);
diff --git a/src/AzureDataFactory.TestingFramework/Generated/Models/HiveSource.cs b/src/AzureDataFactory.TestingFramework/Generated/Models/HiveSource.cs
index 5e76ec03..154d0f60 100644
--- a/src/AzureDataFactory.TestingFramework/Generated/Models/HiveSource.cs
+++ b/src/AzureDataFactory.TestingFramework/Generated/Models/HiveSource.cs
@@ -28,7 +28,7 @@ public HiveSource()
         /// <param name="queryTimeout"> Query timeout. Type: string (or Expression with resultType string), pattern: ((\d+)\.)?(\d\d):(60|([0-5][0-9])):(60|([0-5][0-9])). </param>
         /// <param name="additionalColumns"> Specifies the additional columns to be added to source data. Type: array of objects(AdditionalColumns) (or Expression with resultType array of objects). </param>
         /// <param name="query"> A query to retrieve data from source. Type: string (or Expression with resultType string). </param>
-        internal HiveSource(string copySourceType, DataFactoryElement<int> sourceRetryCount, DataFactoryElement<string> sourceRetryWait, DataFactoryElement<int> maxConcurrentConnections, DataFactoryElement<bool> disableMetricsCollection, IDictionary<string, BinaryData> additionalProperties, DataFactoryElement<string> queryTimeout, BinaryData additionalColumns, DataFactoryElement<string> query) : base(copySourceType, sourceRetryCount, sourceRetryWait, maxConcurrentConnections, disableMetricsCollection, additionalProperties, queryTimeout, additionalColumns)
+        internal HiveSource(string copySourceType, DataFactoryElement<int> sourceRetryCount, DataFactoryElement<string> sourceRetryWait, DataFactoryElement<int> maxConcurrentConnections, DataFactoryElement<bool> disableMetricsCollection, IDictionary<string, DataFactoryElement<string>> additionalProperties, DataFactoryElement<string> queryTimeout, BinaryData additionalColumns, DataFactoryElement<string> query) : base(copySourceType, sourceRetryCount, sourceRetryWait, maxConcurrentConnections, disableMetricsCollection, additionalProperties, queryTimeout, additionalColumns)
         {
             Query = query;
             CopySourceType = copySourceType ?? "HiveSource";
diff --git a/src/AzureDataFactory.TestingFramework/Generated/Models/HttpLinkedService.Serialization.cs b/src/AzureDataFactory.TestingFramework/Generated/Models/HttpLinkedService.Serialization.cs
index 082c7402..e509a9b6 100644
--- a/src/AzureDataFactory.TestingFramework/Generated/Models/HttpLinkedService.Serialization.cs
+++ b/src/AzureDataFactory.TestingFramework/Generated/Models/HttpLinkedService.Serialization.cs
@@ -135,8 +135,8 @@ internal static HttpLinkedService DeserializeHttpLinkedService(JsonElement eleme
             Optional<DataFactoryElement<string>> certThumbprint = default;
             Optional<string> encryptedCredential = default;
             Optional<DataFactoryElement<bool>> enableServerCertificateValidation = default;
-            IDictionary<string, BinaryData> additionalProperties = default;
-            Dictionary<string, BinaryData> additionalPropertiesDictionary = new Dictionary<string, BinaryData>();
+            IDictionary<string, DataFactoryElement<string>> additionalProperties = default;
+            Dictionary<string, DataFactoryElement<string>> additionalPropertiesDictionary = new Dictionary<string, DataFactoryElement<string>>();
             foreach (var property in element.EnumerateObject())
             {
                 if (property.NameEquals("type"u8))
@@ -278,7 +278,7 @@ internal static HttpLinkedService DeserializeHttpLinkedService(JsonElement eleme
                     }
                     continue;
                 }
-                additionalPropertiesDictionary.Add(property.Name, BinaryData.FromString(property.Value.GetRawText()));
+                additionalPropertiesDictionary.Add(property.Name, JsonSerializer.Deserialize<DataFactoryElement<string>>(property.Value.GetRawText()));
             }
             additionalProperties = additionalPropertiesDictionary;
             return new HttpLinkedService(type, connectVia.Value, description.Value, Optional.ToDictionary(parameters), Optional.ToList(annotations), additionalProperties, url, Optional.ToNullable(authenticationType), userName.Value, password, authHeaders.Value, embeddedCertData.Value, certThumbprint.Value, encryptedCredential.Value, enableServerCertificateValidation.Value);
diff --git a/src/AzureDataFactory.TestingFramework/Generated/Models/HttpLinkedService.cs b/src/AzureDataFactory.TestingFramework/Generated/Models/HttpLinkedService.cs
index 905ff8a3..2a99262c 100644
--- a/src/AzureDataFactory.TestingFramework/Generated/Models/HttpLinkedService.cs
+++ b/src/AzureDataFactory.TestingFramework/Generated/Models/HttpLinkedService.cs
@@ -40,7 +40,7 @@ public HttpLinkedService(DataFactoryElement<string> uri)
         /// <param name="certThumbprint"> Thumbprint of certificate for ClientCertificate authentication. Only valid for on-premises copy. For on-premises copy with ClientCertificate authentication, either CertThumbprint or EmbeddedCertData/Password should be specified. Type: string (or Expression with resultType string). </param>
         /// <param name="encryptedCredential"> The encrypted credential used for authentication. Credentials are encrypted using the integration runtime credential manager. Type: string. </param>
         /// <param name="enableServerCertificateValidation"> If true, validate the HTTPS server SSL certificate. Default value is true. Type: boolean (or Expression with resultType boolean). </param>
-        internal HttpLinkedService(string linkedServiceType, IntegrationRuntimeReference connectVia, string description, IDictionary<string, EntityParameterSpecification> parameters, IList<BinaryData> annotations, IDictionary<string, BinaryData> additionalProperties, DataFactoryElement<string> uri, HttpAuthenticationType? authenticationType, DataFactoryElement<string> userName, DataFactorySecretBaseDefinition password, DataFactoryElement<BinaryData> authHeaders, DataFactoryElement<string> embeddedCertData, DataFactoryElement<string> certThumbprint, string encryptedCredential, DataFactoryElement<bool> enableServerCertificateValidation) : base(linkedServiceType, connectVia, description, parameters, annotations, additionalProperties)
+        internal HttpLinkedService(string linkedServiceType, IntegrationRuntimeReference connectVia, string description, IDictionary<string, EntityParameterSpecification> parameters, IList<BinaryData> annotations, IDictionary<string, DataFactoryElement<string>> additionalProperties, DataFactoryElement<string> uri, HttpAuthenticationType? authenticationType, DataFactoryElement<string> userName, DataFactorySecretBaseDefinition password, DataFactoryElement<BinaryData> authHeaders, DataFactoryElement<string> embeddedCertData, DataFactoryElement<string> certThumbprint, string encryptedCredential, DataFactoryElement<bool> enableServerCertificateValidation) : base(linkedServiceType, connectVia, description, parameters, annotations, additionalProperties)
         {
             Uri = uri;
             AuthenticationType = authenticationType;
diff --git a/src/AzureDataFactory.TestingFramework/Generated/Models/HttpReadSettings.Serialization.cs b/src/AzureDataFactory.TestingFramework/Generated/Models/HttpReadSettings.Serialization.cs
index 415dd236..e7ce91e1 100644
--- a/src/AzureDataFactory.TestingFramework/Generated/Models/HttpReadSettings.Serialization.cs
+++ b/src/AzureDataFactory.TestingFramework/Generated/Models/HttpReadSettings.Serialization.cs
@@ -83,8 +83,8 @@ internal static HttpReadSettings DeserializeHttpReadSettings(JsonElement element
             string type = default;
             Optional<DataFactoryElement<int>> maxConcurrentConnections = default;
             Optional<DataFactoryElement<bool>> disableMetricsCollection = default;
-            IDictionary<string, BinaryData> additionalProperties = default;
-            Dictionary<string, BinaryData> additionalPropertiesDictionary = new Dictionary<string, BinaryData>();
+            IDictionary<string, DataFactoryElement<string>> additionalProperties = default;
+            Dictionary<string, DataFactoryElement<string>> additionalPropertiesDictionary = new Dictionary<string, DataFactoryElement<string>>();
             foreach (var property in element.EnumerateObject())
             {
                 if (property.NameEquals("requestMethod"u8))
@@ -155,7 +155,7 @@ internal static HttpReadSettings DeserializeHttpReadSettings(JsonElement element
                     disableMetricsCollection = JsonSerializer.Deserialize<DataFactoryElement<bool>>(property.Value.GetRawText());
                     continue;
                 }
-                additionalPropertiesDictionary.Add(property.Name, BinaryData.FromString(property.Value.GetRawText()));
+                additionalPropertiesDictionary.Add(property.Name, JsonSerializer.Deserialize<DataFactoryElement<string>>(property.Value.GetRawText()));
             }
             additionalProperties = additionalPropertiesDictionary;
             return new HttpReadSettings(type, maxConcurrentConnections.Value, disableMetricsCollection.Value, additionalProperties, requestMethod.Value, requestBody.Value, additionalHeaders.Value, requestTimeout.Value, additionalColumns.Value);
diff --git a/src/AzureDataFactory.TestingFramework/Generated/Models/HttpReadSettings.cs b/src/AzureDataFactory.TestingFramework/Generated/Models/HttpReadSettings.cs
index 707c2c6e..b76fa8a8 100644
--- a/src/AzureDataFactory.TestingFramework/Generated/Models/HttpReadSettings.cs
+++ b/src/AzureDataFactory.TestingFramework/Generated/Models/HttpReadSettings.cs
@@ -28,7 +28,7 @@ public HttpReadSettings()
         /// <param name="additionalHeaders"> The additional HTTP headers in the request to the RESTful API. Type: string (or Expression with resultType string). </param>
         /// <param name="requestTimeout"> Specifies the timeout for a HTTP client to get HTTP response from HTTP server. Type: string (or Expression with resultType string). </param>
         /// <param name="additionalColumns"> Specifies the additional columns to be added to source data. Type: array of objects(AdditionalColumns) (or Expression with resultType array of objects). </param>
-        internal HttpReadSettings(string storeReadSettingsType, DataFactoryElement<int> maxConcurrentConnections, DataFactoryElement<bool> disableMetricsCollection, IDictionary<string, BinaryData> additionalProperties, DataFactoryElement<string> requestMethod, DataFactoryElement<string> requestBody, DataFactoryElement<string> additionalHeaders, DataFactoryElement<string> requestTimeout, BinaryData additionalColumns) : base(storeReadSettingsType, maxConcurrentConnections, disableMetricsCollection, additionalProperties)
+        internal HttpReadSettings(string storeReadSettingsType, DataFactoryElement<int> maxConcurrentConnections, DataFactoryElement<bool> disableMetricsCollection, IDictionary<string, DataFactoryElement<string>> additionalProperties, DataFactoryElement<string> requestMethod, DataFactoryElement<string> requestBody, DataFactoryElement<string> additionalHeaders, DataFactoryElement<string> requestTimeout, BinaryData additionalColumns) : base(storeReadSettingsType, maxConcurrentConnections, disableMetricsCollection, additionalProperties)
         {
             RequestMethod = requestMethod;
             RequestBody = requestBody;
diff --git a/src/AzureDataFactory.TestingFramework/Generated/Models/HttpServerLocation.Serialization.cs b/src/AzureDataFactory.TestingFramework/Generated/Models/HttpServerLocation.Serialization.cs
index 24a4a9e2..3442cf63 100644
--- a/src/AzureDataFactory.TestingFramework/Generated/Models/HttpServerLocation.Serialization.cs
+++ b/src/AzureDataFactory.TestingFramework/Generated/Models/HttpServerLocation.Serialization.cs
@@ -55,8 +55,8 @@ internal static HttpServerLocation DeserializeHttpServerLocation(JsonElement ele
             string type = default;
             Optional<DataFactoryElement<string>> folderPath = default;
             Optional<DataFactoryElement<string>> fileName = default;
-            IDictionary<string, BinaryData> additionalProperties = default;
-            Dictionary<string, BinaryData> additionalPropertiesDictionary = new Dictionary<string, BinaryData>();
+            IDictionary<string, DataFactoryElement<string>> additionalProperties = default;
+            Dictionary<string, DataFactoryElement<string>> additionalPropertiesDictionary = new Dictionary<string, DataFactoryElement<string>>();
             foreach (var property in element.EnumerateObject())
             {
                 if (property.NameEquals("relativeUrl"u8))
@@ -91,7 +91,7 @@ internal static HttpServerLocation DeserializeHttpServerLocation(JsonElement ele
                     fileName = JsonSerializer.Deserialize<DataFactoryElement<string>>(property.Value.GetRawText());
                     continue;
                 }
-                additionalPropertiesDictionary.Add(property.Name, BinaryData.FromString(property.Value.GetRawText()));
+                additionalPropertiesDictionary.Add(property.Name, JsonSerializer.Deserialize<DataFactoryElement<string>>(property.Value.GetRawText()));
             }
             additionalProperties = additionalPropertiesDictionary;
             return new HttpServerLocation(type, folderPath.Value, fileName.Value, additionalProperties, relativeUrl.Value);
diff --git a/src/AzureDataFactory.TestingFramework/Generated/Models/HttpServerLocation.cs b/src/AzureDataFactory.TestingFramework/Generated/Models/HttpServerLocation.cs
index 076e738f..82244132 100644
--- a/src/AzureDataFactory.TestingFramework/Generated/Models/HttpServerLocation.cs
+++ b/src/AzureDataFactory.TestingFramework/Generated/Models/HttpServerLocation.cs
@@ -24,7 +24,7 @@ public HttpServerLocation()
         /// <param name="fileName"> Specify the file name of dataset. Type: string (or Expression with resultType string). </param>
         /// <param name="additionalProperties"> Additional Properties. </param>
         /// <param name="relativeUri"> Specify the relativeUrl of http server. Type: string (or Expression with resultType string). </param>
-        internal HttpServerLocation(string datasetLocationType, DataFactoryElement<string> folderPath, DataFactoryElement<string> fileName, IDictionary<string, BinaryData> additionalProperties, DataFactoryElement<string> relativeUri) : base(datasetLocationType, folderPath, fileName, additionalProperties)
+        internal HttpServerLocation(string datasetLocationType, DataFactoryElement<string> folderPath, DataFactoryElement<string> fileName, IDictionary<string, DataFactoryElement<string>> additionalProperties, DataFactoryElement<string> relativeUri) : base(datasetLocationType, folderPath, fileName, additionalProperties)
         {
             RelativeUri = relativeUri;
             DatasetLocationType = datasetLocationType ?? "HttpServerLocation";
diff --git a/src/AzureDataFactory.TestingFramework/Generated/Models/HubspotLinkedService.Serialization.cs b/src/AzureDataFactory.TestingFramework/Generated/Models/HubspotLinkedService.Serialization.cs
index d8c20288..60ed4a75 100644
--- a/src/AzureDataFactory.TestingFramework/Generated/Models/HubspotLinkedService.Serialization.cs
+++ b/src/AzureDataFactory.TestingFramework/Generated/Models/HubspotLinkedService.Serialization.cs
@@ -129,8 +129,8 @@ internal static HubspotLinkedService DeserializeHubspotLinkedService(JsonElement
             Optional<DataFactoryElement<bool>> useHostVerification = default;
             Optional<DataFactoryElement<bool>> usePeerVerification = default;
             Optional<string> encryptedCredential = default;
-            IDictionary<string, BinaryData> additionalProperties = default;
-            Dictionary<string, BinaryData> additionalPropertiesDictionary = new Dictionary<string, BinaryData>();
+            IDictionary<string, DataFactoryElement<string>> additionalProperties = default;
+            Dictionary<string, DataFactoryElement<string>> additionalPropertiesDictionary = new Dictionary<string, DataFactoryElement<string>>();
             foreach (var property in element.EnumerateObject())
             {
                 if (property.NameEquals("type"u8))
@@ -263,7 +263,7 @@ internal static HubspotLinkedService DeserializeHubspotLinkedService(JsonElement
                     }
                     continue;
                 }
-                additionalPropertiesDictionary.Add(property.Name, BinaryData.FromString(property.Value.GetRawText()));
+                additionalPropertiesDictionary.Add(property.Name, JsonSerializer.Deserialize<DataFactoryElement<string>>(property.Value.GetRawText()));
             }
             additionalProperties = additionalPropertiesDictionary;
             return new HubspotLinkedService(type, connectVia.Value, description.Value, Optional.ToDictionary(parameters), Optional.ToList(annotations), additionalProperties, clientId, clientSecret, accessToken, refreshToken, useEncryptedEndpoints.Value, useHostVerification.Value, usePeerVerification.Value, encryptedCredential.Value);
diff --git a/src/AzureDataFactory.TestingFramework/Generated/Models/HubspotLinkedService.cs b/src/AzureDataFactory.TestingFramework/Generated/Models/HubspotLinkedService.cs
index 4651b43c..449014d3 100644
--- a/src/AzureDataFactory.TestingFramework/Generated/Models/HubspotLinkedService.cs
+++ b/src/AzureDataFactory.TestingFramework/Generated/Models/HubspotLinkedService.cs
@@ -39,7 +39,7 @@ public HubspotLinkedService(DataFactoryElement<string> clientId)
         /// <param name="useHostVerification"> Specifies whether to require the host name in the server's certificate to match the host name of the server when connecting over SSL. The default value is true. </param>
         /// <param name="usePeerVerification"> Specifies whether to verify the identity of the server when connecting over SSL. The default value is true. </param>
         /// <param name="encryptedCredential"> The encrypted credential used for authentication. Credentials are encrypted using the integration runtime credential manager. Type: string. </param>
-        internal HubspotLinkedService(string linkedServiceType, IntegrationRuntimeReference connectVia, string description, IDictionary<string, EntityParameterSpecification> parameters, IList<BinaryData> annotations, IDictionary<string, BinaryData> additionalProperties, DataFactoryElement<string> clientId, DataFactorySecretBaseDefinition clientSecret, DataFactorySecretBaseDefinition accessToken, DataFactorySecretBaseDefinition refreshToken, DataFactoryElement<bool> useEncryptedEndpoints, DataFactoryElement<bool> useHostVerification, DataFactoryElement<bool> usePeerVerification, string encryptedCredential) : base(linkedServiceType, connectVia, description, parameters, annotations, additionalProperties)
+        internal HubspotLinkedService(string linkedServiceType, IntegrationRuntimeReference connectVia, string description, IDictionary<string, EntityParameterSpecification> parameters, IList<BinaryData> annotations, IDictionary<string, DataFactoryElement<string>> additionalProperties, DataFactoryElement<string> clientId, DataFactorySecretBaseDefinition clientSecret, DataFactorySecretBaseDefinition accessToken, DataFactorySecretBaseDefinition refreshToken, DataFactoryElement<bool> useEncryptedEndpoints, DataFactoryElement<bool> useHostVerification, DataFactoryElement<bool> usePeerVerification, string encryptedCredential) : base(linkedServiceType, connectVia, description, parameters, annotations, additionalProperties)
         {
             ClientId = clientId;
             ClientSecret = clientSecret;
diff --git a/src/AzureDataFactory.TestingFramework/Generated/Models/HubspotObjectDataset.Serialization.cs b/src/AzureDataFactory.TestingFramework/Generated/Models/HubspotObjectDataset.Serialization.cs
index a1132ec8..6fe3b2d1 100644
--- a/src/AzureDataFactory.TestingFramework/Generated/Models/HubspotObjectDataset.Serialization.cs
+++ b/src/AzureDataFactory.TestingFramework/Generated/Models/HubspotObjectDataset.Serialization.cs
@@ -104,8 +104,8 @@ internal static HubspotObjectDataset DeserializeHubspotObjectDataset(JsonElement
             Optional<IList<BinaryData>> annotations = default;
             Optional<DatasetFolder> folder = default;
             Optional<DataFactoryElement<string>> tableName = default;
-            IDictionary<string, BinaryData> additionalProperties = default;
-            Dictionary<string, BinaryData> additionalPropertiesDictionary = new Dictionary<string, BinaryData>();
+            IDictionary<string, DataFactoryElement<string>> additionalProperties = default;
+            Dictionary<string, DataFactoryElement<string>> additionalPropertiesDictionary = new Dictionary<string, DataFactoryElement<string>>();
             foreach (var property in element.EnumerateObject())
             {
                 if (property.NameEquals("type"u8))
@@ -206,7 +206,7 @@ internal static HubspotObjectDataset DeserializeHubspotObjectDataset(JsonElement
                     }
                     continue;
                 }
-                additionalPropertiesDictionary.Add(property.Name, BinaryData.FromString(property.Value.GetRawText()));
+                additionalPropertiesDictionary.Add(property.Name, JsonSerializer.Deserialize<DataFactoryElement<string>>(property.Value.GetRawText()));
             }
             additionalProperties = additionalPropertiesDictionary;
             return new HubspotObjectDataset(type, description.Value, structure.Value, schema.Value, linkedServiceName, Optional.ToDictionary(parameters), Optional.ToList(annotations), folder.Value, additionalProperties, tableName.Value);
diff --git a/src/AzureDataFactory.TestingFramework/Generated/Models/HubspotObjectDataset.cs b/src/AzureDataFactory.TestingFramework/Generated/Models/HubspotObjectDataset.cs
index 35c71661..a71d7b0f 100644
--- a/src/AzureDataFactory.TestingFramework/Generated/Models/HubspotObjectDataset.cs
+++ b/src/AzureDataFactory.TestingFramework/Generated/Models/HubspotObjectDataset.cs
@@ -34,7 +34,7 @@ public HubspotObjectDataset(DataFactoryLinkedServiceReference linkedServiceName)
         /// <param name="folder"> The folder that this Dataset is in. If not specified, Dataset will appear at the root level. </param>
         /// <param name="additionalProperties"> Additional Properties. </param>
         /// <param name="tableName"> The table name. Type: string (or Expression with resultType string). </param>
-        internal HubspotObjectDataset(string datasetType, string description, DataFactoryElement<IList<DatasetDataElement>> structure, DataFactoryElement<IList<DatasetSchemaDataElement>> schema, DataFactoryLinkedServiceReference linkedServiceName, IDictionary<string, EntityParameterSpecification> parameters, IList<BinaryData> annotations, DatasetFolder folder, IDictionary<string, BinaryData> additionalProperties, DataFactoryElement<string> tableName) : base(datasetType, description, structure, schema, linkedServiceName, parameters, annotations, folder, additionalProperties)
+        internal HubspotObjectDataset(string datasetType, string description, DataFactoryElement<IList<DatasetDataElement>> structure, DataFactoryElement<IList<DatasetSchemaDataElement>> schema, DataFactoryLinkedServiceReference linkedServiceName, IDictionary<string, EntityParameterSpecification> parameters, IList<BinaryData> annotations, DatasetFolder folder, IDictionary<string, DataFactoryElement<string>> additionalProperties, DataFactoryElement<string> tableName) : base(datasetType, description, structure, schema, linkedServiceName, parameters, annotations, folder, additionalProperties)
         {
             TableName = tableName;
             DatasetType = datasetType ?? "HubspotObject";
diff --git a/src/AzureDataFactory.TestingFramework/Generated/Models/HubspotSource.Serialization.cs b/src/AzureDataFactory.TestingFramework/Generated/Models/HubspotSource.Serialization.cs
index c01b4bd0..a282adee 100644
--- a/src/AzureDataFactory.TestingFramework/Generated/Models/HubspotSource.Serialization.cs
+++ b/src/AzureDataFactory.TestingFramework/Generated/Models/HubspotSource.Serialization.cs
@@ -83,8 +83,8 @@ internal static HubspotSource DeserializeHubspotSource(JsonElement element)
             Optional<DataFactoryElement<string>> sourceRetryWait = default;
             Optional<DataFactoryElement<int>> maxConcurrentConnections = default;
             Optional<DataFactoryElement<bool>> disableMetricsCollection = default;
-            IDictionary<string, BinaryData> additionalProperties = default;
-            Dictionary<string, BinaryData> additionalPropertiesDictionary = new Dictionary<string, BinaryData>();
+            IDictionary<string, DataFactoryElement<string>> additionalProperties = default;
+            Dictionary<string, DataFactoryElement<string>> additionalPropertiesDictionary = new Dictionary<string, DataFactoryElement<string>>();
             foreach (var property in element.EnumerateObject())
             {
                 if (property.NameEquals("query"u8))
@@ -155,7 +155,7 @@ internal static HubspotSource DeserializeHubspotSource(JsonElement element)
                     disableMetricsCollection = JsonSerializer.Deserialize<DataFactoryElement<bool>>(property.Value.GetRawText());
                     continue;
                 }
-                additionalPropertiesDictionary.Add(property.Name, BinaryData.FromString(property.Value.GetRawText()));
+                additionalPropertiesDictionary.Add(property.Name, JsonSerializer.Deserialize<DataFactoryElement<string>>(property.Value.GetRawText()));
             }
             additionalProperties = additionalPropertiesDictionary;
             return new HubspotSource(type, sourceRetryCount.Value, sourceRetryWait.Value, maxConcurrentConnections.Value, disableMetricsCollection.Value, additionalProperties, queryTimeout.Value, additionalColumns.Value, query.Value);
diff --git a/src/AzureDataFactory.TestingFramework/Generated/Models/HubspotSource.cs b/src/AzureDataFactory.TestingFramework/Generated/Models/HubspotSource.cs
index b90d7add..5ab5cf61 100644
--- a/src/AzureDataFactory.TestingFramework/Generated/Models/HubspotSource.cs
+++ b/src/AzureDataFactory.TestingFramework/Generated/Models/HubspotSource.cs
@@ -28,7 +28,7 @@ public HubspotSource()
         /// <param name="queryTimeout"> Query timeout. Type: string (or Expression with resultType string), pattern: ((\d+)\.)?(\d\d):(60|([0-5][0-9])):(60|([0-5][0-9])). </param>
         /// <param name="additionalColumns"> Specifies the additional columns to be added to source data. Type: array of objects(AdditionalColumns) (or Expression with resultType array of objects). </param>
         /// <param name="query"> A query to retrieve data from source. Type: string (or Expression with resultType string). </param>
-        internal HubspotSource(string copySourceType, DataFactoryElement<int> sourceRetryCount, DataFactoryElement<string> sourceRetryWait, DataFactoryElement<int> maxConcurrentConnections, DataFactoryElement<bool> disableMetricsCollection, IDictionary<string, BinaryData> additionalProperties, DataFactoryElement<string> queryTimeout, BinaryData additionalColumns, DataFactoryElement<string> query) : base(copySourceType, sourceRetryCount, sourceRetryWait, maxConcurrentConnections, disableMetricsCollection, additionalProperties, queryTimeout, additionalColumns)
+        internal HubspotSource(string copySourceType, DataFactoryElement<int> sourceRetryCount, DataFactoryElement<string> sourceRetryWait, DataFactoryElement<int> maxConcurrentConnections, DataFactoryElement<bool> disableMetricsCollection, IDictionary<string, DataFactoryElement<string>> additionalProperties, DataFactoryElement<string> queryTimeout, BinaryData additionalColumns, DataFactoryElement<string> query) : base(copySourceType, sourceRetryCount, sourceRetryWait, maxConcurrentConnections, disableMetricsCollection, additionalProperties, queryTimeout, additionalColumns)
         {
             Query = query;
             CopySourceType = copySourceType ?? "HubspotSource";
diff --git a/src/AzureDataFactory.TestingFramework/Generated/Models/IfConditionActivity.Serialization.cs b/src/AzureDataFactory.TestingFramework/Generated/Models/IfConditionActivity.Serialization.cs
index 813583df..fa21a4df 100644
--- a/src/AzureDataFactory.TestingFramework/Generated/Models/IfConditionActivity.Serialization.cs
+++ b/src/AzureDataFactory.TestingFramework/Generated/Models/IfConditionActivity.Serialization.cs
@@ -7,6 +7,7 @@
 
 using System.Text.Json;
 using Azure.Core;
+using Azure.Core.Expressions.DataFactory;
 
 namespace AzureDataFactory.TestingFramework.Models
 {
@@ -107,8 +108,8 @@ internal static IfConditionActivity DeserializeIfConditionActivity(JsonElement e
             DataFactoryExpression expression = default;
             Optional<IList<PipelineActivity>> ifTrueActivities = default;
             Optional<IList<PipelineActivity>> ifFalseActivities = default;
-            IDictionary<string, BinaryData> additionalProperties = default;
-            Dictionary<string, BinaryData> additionalPropertiesDictionary = new Dictionary<string, BinaryData>();
+            IDictionary<string, DataFactoryElement<string>> additionalProperties = default;
+            Dictionary<string, DataFactoryElement<string>> additionalPropertiesDictionary = new Dictionary<string, DataFactoryElement<string>>();
             foreach (var property in element.EnumerateObject())
             {
                 if (property.NameEquals("name"u8))
@@ -217,7 +218,7 @@ internal static IfConditionActivity DeserializeIfConditionActivity(JsonElement e
                     }
                     continue;
                 }
-                additionalPropertiesDictionary.Add(property.Name, BinaryData.FromString(property.Value.GetRawText()));
+                additionalPropertiesDictionary.Add(property.Name, JsonSerializer.Deserialize<DataFactoryElement<string>>(property.Value.GetRawText()));
             }
             additionalProperties = additionalPropertiesDictionary;
             return new IfConditionActivity(name, type, description.Value, Optional.ToNullable(state), Optional.ToNullable(onInactiveMarkAs), Optional.ToList(dependsOn), Optional.ToList(userProperties), additionalProperties, expression, Optional.ToList(ifTrueActivities), Optional.ToList(ifFalseActivities));
diff --git a/src/AzureDataFactory.TestingFramework/Generated/Models/IfConditionActivity.cs b/src/AzureDataFactory.TestingFramework/Generated/Models/IfConditionActivity.cs
index f05497bd..75ec2ad5 100644
--- a/src/AzureDataFactory.TestingFramework/Generated/Models/IfConditionActivity.cs
+++ b/src/AzureDataFactory.TestingFramework/Generated/Models/IfConditionActivity.cs
@@ -6,6 +6,7 @@
 #nullable disable
 
 using Azure.Core;
+using Azure.Core.Expressions.DataFactory;
 
 namespace AzureDataFactory.TestingFramework.Models
 {
@@ -47,7 +48,7 @@ public IfConditionActivity(string name, DataFactoryExpression expression) : base
         /// Please note <see cref="PipelineActivity"/> is the base class. According to the scenario, a derived class of the base class might need to be assigned here, or this property needs to be casted to one of the possible derived classes.
         /// The available derived classes include <see cref="AppendVariableActivity"/>, <see cref="AzureDataExplorerCommandActivity"/>, <see cref="AzureFunctionActivity"/>, <see cref="AzureMLBatchExecutionActivity"/>, <see cref="AzureMLExecutePipelineActivity"/>, <see cref="AzureMLUpdateResourceActivity"/>, <see cref="ControlActivity"/>, <see cref="CopyActivity"/>, <see cref="CustomActivity"/>, <see cref="DataLakeAnalyticsUsqlActivity"/>, <see cref="DatabricksNotebookActivity"/>, <see cref="DatabricksSparkJarActivity"/>, <see cref="DatabricksSparkPythonActivity"/>, <see cref="DeleteActivity"/>, <see cref="ExecuteDataFlowActivity"/>, <see cref="ExecutePipelineActivity"/>, <see cref="ExecuteSsisPackageActivity"/>, <see cref="ExecuteWranglingDataflowActivity"/>, <see cref="ExecutionActivity"/>, <see cref="FailActivity"/>, <see cref="FilterActivity"/>, <see cref="ForEachActivity"/>, <see cref="GetDatasetMetadataActivity"/>, <see cref="HDInsightHiveActivity"/>, <see cref="HDInsightMapReduceActivity"/>, <see cref="HDInsightPigActivity"/>, <see cref="HDInsightSparkActivity"/>, <see cref="HDInsightStreamingActivity"/>, <see cref="IfConditionActivity"/>, <see cref="LookupActivity"/>, <see cref="DataFactoryScriptActivity"/>, <see cref="SetVariableActivity"/>, <see cref="SynapseSparkJobDefinitionActivity"/>, <see cref="SqlServerStoredProcedureActivity"/>, <see cref="SwitchActivity"/>, <see cref="SynapseNotebookActivity"/>, <see cref="UntilActivity"/>, <see cref="ValidationActivity"/>, <see cref="WaitActivity"/>, <see cref="WebActivity"/> and <see cref="WebHookActivity"/>.
         /// </param>
-        internal IfConditionActivity(string name, string activityType, string description, PipelineActivityState? state, ActivityOnInactiveMarkAs? onInactiveMarkAs, IList<PipelineActivityDependency> dependsOn, IList<PipelineActivityUserProperty> userProperties, IDictionary<string, BinaryData> additionalProperties, DataFactoryExpression expression, IList<PipelineActivity> ifTrueActivities, IList<PipelineActivity> ifFalseActivities) : base(name, activityType, description, state, onInactiveMarkAs, dependsOn, userProperties, additionalProperties)
+        internal IfConditionActivity(string name, string activityType, string description, PipelineActivityState? state, ActivityOnInactiveMarkAs? onInactiveMarkAs, IList<PipelineActivityDependency> dependsOn, IList<PipelineActivityUserProperty> userProperties, IDictionary<string, DataFactoryElement<string>> additionalProperties, DataFactoryExpression expression, IList<PipelineActivity> ifTrueActivities, IList<PipelineActivity> ifFalseActivities) : base(name, activityType, description, state, onInactiveMarkAs, dependsOn, userProperties, additionalProperties)
         {
             Expression = expression;
             IfTrueActivities = ifTrueActivities;
diff --git a/src/AzureDataFactory.TestingFramework/Generated/Models/ImpalaLinkedService.Serialization.cs b/src/AzureDataFactory.TestingFramework/Generated/Models/ImpalaLinkedService.Serialization.cs
index 6eea6ea3..ea39e10c 100644
--- a/src/AzureDataFactory.TestingFramework/Generated/Models/ImpalaLinkedService.Serialization.cs
+++ b/src/AzureDataFactory.TestingFramework/Generated/Models/ImpalaLinkedService.Serialization.cs
@@ -144,8 +144,8 @@ internal static ImpalaLinkedService DeserializeImpalaLinkedService(JsonElement e
             Optional<DataFactoryElement<bool>> allowHostNameCNMismatch = default;
             Optional<DataFactoryElement<bool>> allowSelfSignedServerCert = default;
             Optional<string> encryptedCredential = default;
-            IDictionary<string, BinaryData> additionalProperties = default;
-            Dictionary<string, BinaryData> additionalPropertiesDictionary = new Dictionary<string, BinaryData>();
+            IDictionary<string, DataFactoryElement<string>> additionalProperties = default;
+            Dictionary<string, DataFactoryElement<string>> additionalPropertiesDictionary = new Dictionary<string, DataFactoryElement<string>>();
             foreach (var property in element.EnumerateObject())
             {
                 if (property.NameEquals("type"u8))
@@ -301,7 +301,7 @@ internal static ImpalaLinkedService DeserializeImpalaLinkedService(JsonElement e
                     }
                     continue;
                 }
-                additionalPropertiesDictionary.Add(property.Name, BinaryData.FromString(property.Value.GetRawText()));
+                additionalPropertiesDictionary.Add(property.Name, JsonSerializer.Deserialize<DataFactoryElement<string>>(property.Value.GetRawText()));
             }
             additionalProperties = additionalPropertiesDictionary;
             return new ImpalaLinkedService(type, connectVia.Value, description.Value, Optional.ToDictionary(parameters), Optional.ToList(annotations), additionalProperties, host, port.Value, authenticationType, username.Value, password, enableSsl.Value, trustedCertPath.Value, useSystemTrustStore.Value, allowHostNameCNMismatch.Value, allowSelfSignedServerCert.Value, encryptedCredential.Value);
diff --git a/src/AzureDataFactory.TestingFramework/Generated/Models/ImpalaLinkedService.cs b/src/AzureDataFactory.TestingFramework/Generated/Models/ImpalaLinkedService.cs
index f5d6ec5d..df472e51 100644
--- a/src/AzureDataFactory.TestingFramework/Generated/Models/ImpalaLinkedService.cs
+++ b/src/AzureDataFactory.TestingFramework/Generated/Models/ImpalaLinkedService.cs
@@ -44,7 +44,7 @@ public ImpalaLinkedService(DataFactoryElement<string> host, ImpalaAuthentication
         /// <param name="allowHostNameCNMismatch"> Specifies whether to require a CA-issued SSL certificate name to match the host name of the server when connecting over SSL. The default value is false. </param>
         /// <param name="allowSelfSignedServerCert"> Specifies whether to allow self-signed certificates from the server. The default value is false. </param>
         /// <param name="encryptedCredential"> The encrypted credential used for authentication. Credentials are encrypted using the integration runtime credential manager. Type: string. </param>
-        internal ImpalaLinkedService(string linkedServiceType, IntegrationRuntimeReference connectVia, string description, IDictionary<string, EntityParameterSpecification> parameters, IList<BinaryData> annotations, IDictionary<string, BinaryData> additionalProperties, DataFactoryElement<string> host, DataFactoryElement<int> port, ImpalaAuthenticationType authenticationType, DataFactoryElement<string> username, DataFactorySecretBaseDefinition password, DataFactoryElement<bool> enableSsl, DataFactoryElement<string> trustedCertPath, DataFactoryElement<bool> useSystemTrustStore, DataFactoryElement<bool> allowHostNameCNMismatch, DataFactoryElement<bool> allowSelfSignedServerCert, string encryptedCredential) : base(linkedServiceType, connectVia, description, parameters, annotations, additionalProperties)
+        internal ImpalaLinkedService(string linkedServiceType, IntegrationRuntimeReference connectVia, string description, IDictionary<string, EntityParameterSpecification> parameters, IList<BinaryData> annotations, IDictionary<string, DataFactoryElement<string>> additionalProperties, DataFactoryElement<string> host, DataFactoryElement<int> port, ImpalaAuthenticationType authenticationType, DataFactoryElement<string> username, DataFactorySecretBaseDefinition password, DataFactoryElement<bool> enableSsl, DataFactoryElement<string> trustedCertPath, DataFactoryElement<bool> useSystemTrustStore, DataFactoryElement<bool> allowHostNameCNMismatch, DataFactoryElement<bool> allowSelfSignedServerCert, string encryptedCredential) : base(linkedServiceType, connectVia, description, parameters, annotations, additionalProperties)
         {
             Host = host;
             Port = port;
diff --git a/src/AzureDataFactory.TestingFramework/Generated/Models/ImpalaObjectDataset.Serialization.cs b/src/AzureDataFactory.TestingFramework/Generated/Models/ImpalaObjectDataset.Serialization.cs
index d292cb4a..92c8c79f 100644
--- a/src/AzureDataFactory.TestingFramework/Generated/Models/ImpalaObjectDataset.Serialization.cs
+++ b/src/AzureDataFactory.TestingFramework/Generated/Models/ImpalaObjectDataset.Serialization.cs
@@ -120,8 +120,8 @@ internal static ImpalaObjectDataset DeserializeImpalaObjectDataset(JsonElement e
             Optional<BinaryData> tableName = default;
             Optional<DataFactoryElement<string>> table = default;
             Optional<DataFactoryElement<string>> schema0 = default;
-            IDictionary<string, BinaryData> additionalProperties = default;
-            Dictionary<string, BinaryData> additionalPropertiesDictionary = new Dictionary<string, BinaryData>();
+            IDictionary<string, DataFactoryElement<string>> additionalProperties = default;
+            Dictionary<string, DataFactoryElement<string>> additionalPropertiesDictionary = new Dictionary<string, DataFactoryElement<string>>();
             foreach (var property in element.EnumerateObject())
             {
                 if (property.NameEquals("type"u8))
@@ -240,7 +240,7 @@ internal static ImpalaObjectDataset DeserializeImpalaObjectDataset(JsonElement e
                     }
                     continue;
                 }
-                additionalPropertiesDictionary.Add(property.Name, BinaryData.FromString(property.Value.GetRawText()));
+                additionalPropertiesDictionary.Add(property.Name, JsonSerializer.Deserialize<DataFactoryElement<string>>(property.Value.GetRawText()));
             }
             additionalProperties = additionalPropertiesDictionary;
             return new ImpalaObjectDataset(type, description.Value, structure.Value, schema.Value, linkedServiceName, Optional.ToDictionary(parameters), Optional.ToList(annotations), folder.Value, additionalProperties, tableName.Value, table.Value, schema0.Value);
diff --git a/src/AzureDataFactory.TestingFramework/Generated/Models/ImpalaObjectDataset.cs b/src/AzureDataFactory.TestingFramework/Generated/Models/ImpalaObjectDataset.cs
index a91d80b2..ec830d9d 100644
--- a/src/AzureDataFactory.TestingFramework/Generated/Models/ImpalaObjectDataset.cs
+++ b/src/AzureDataFactory.TestingFramework/Generated/Models/ImpalaObjectDataset.cs
@@ -36,7 +36,7 @@ public ImpalaObjectDataset(DataFactoryLinkedServiceReference linkedServiceName)
         /// <param name="tableName"> This property will be retired. Please consider using schema + table properties instead. </param>
         /// <param name="table"> The table name of the Impala. Type: string (or Expression with resultType string). </param>
         /// <param name="schemaTypePropertiesSchema"> The schema name of the Impala. Type: string (or Expression with resultType string). </param>
-        internal ImpalaObjectDataset(string datasetType, string description, DataFactoryElement<IList<DatasetDataElement>> structure, DataFactoryElement<IList<DatasetSchemaDataElement>> schema, DataFactoryLinkedServiceReference linkedServiceName, IDictionary<string, EntityParameterSpecification> parameters, IList<BinaryData> annotations, DatasetFolder folder, IDictionary<string, BinaryData> additionalProperties, BinaryData tableName, DataFactoryElement<string> table, DataFactoryElement<string> schemaTypePropertiesSchema) : base(datasetType, description, structure, schema, linkedServiceName, parameters, annotations, folder, additionalProperties)
+        internal ImpalaObjectDataset(string datasetType, string description, DataFactoryElement<IList<DatasetDataElement>> structure, DataFactoryElement<IList<DatasetSchemaDataElement>> schema, DataFactoryLinkedServiceReference linkedServiceName, IDictionary<string, EntityParameterSpecification> parameters, IList<BinaryData> annotations, DatasetFolder folder, IDictionary<string, DataFactoryElement<string>> additionalProperties, BinaryData tableName, DataFactoryElement<string> table, DataFactoryElement<string> schemaTypePropertiesSchema) : base(datasetType, description, structure, schema, linkedServiceName, parameters, annotations, folder, additionalProperties)
         {
             TableName = tableName;
             Table = table;
diff --git a/src/AzureDataFactory.TestingFramework/Generated/Models/ImpalaSource.Serialization.cs b/src/AzureDataFactory.TestingFramework/Generated/Models/ImpalaSource.Serialization.cs
index 0ea12cff..1f8c8dc1 100644
--- a/src/AzureDataFactory.TestingFramework/Generated/Models/ImpalaSource.Serialization.cs
+++ b/src/AzureDataFactory.TestingFramework/Generated/Models/ImpalaSource.Serialization.cs
@@ -83,8 +83,8 @@ internal static ImpalaSource DeserializeImpalaSource(JsonElement element)
             Optional<DataFactoryElement<string>> sourceRetryWait = default;
             Optional<DataFactoryElement<int>> maxConcurrentConnections = default;
             Optional<DataFactoryElement<bool>> disableMetricsCollection = default;
-            IDictionary<string, BinaryData> additionalProperties = default;
-            Dictionary<string, BinaryData> additionalPropertiesDictionary = new Dictionary<string, BinaryData>();
+            IDictionary<string, DataFactoryElement<string>> additionalProperties = default;
+            Dictionary<string, DataFactoryElement<string>> additionalPropertiesDictionary = new Dictionary<string, DataFactoryElement<string>>();
             foreach (var property in element.EnumerateObject())
             {
                 if (property.NameEquals("query"u8))
@@ -155,7 +155,7 @@ internal static ImpalaSource DeserializeImpalaSource(JsonElement element)
                     disableMetricsCollection = JsonSerializer.Deserialize<DataFactoryElement<bool>>(property.Value.GetRawText());
                     continue;
                 }
-                additionalPropertiesDictionary.Add(property.Name, BinaryData.FromString(property.Value.GetRawText()));
+                additionalPropertiesDictionary.Add(property.Name, JsonSerializer.Deserialize<DataFactoryElement<string>>(property.Value.GetRawText()));
             }
             additionalProperties = additionalPropertiesDictionary;
             return new ImpalaSource(type, sourceRetryCount.Value, sourceRetryWait.Value, maxConcurrentConnections.Value, disableMetricsCollection.Value, additionalProperties, queryTimeout.Value, additionalColumns.Value, query.Value);
diff --git a/src/AzureDataFactory.TestingFramework/Generated/Models/ImpalaSource.cs b/src/AzureDataFactory.TestingFramework/Generated/Models/ImpalaSource.cs
index 64411b10..8b6c100a 100644
--- a/src/AzureDataFactory.TestingFramework/Generated/Models/ImpalaSource.cs
+++ b/src/AzureDataFactory.TestingFramework/Generated/Models/ImpalaSource.cs
@@ -28,7 +28,7 @@ public ImpalaSource()
         /// <param name="queryTimeout"> Query timeout. Type: string (or Expression with resultType string), pattern: ((\d+)\.)?(\d\d):(60|([0-5][0-9])):(60|([0-5][0-9])). </param>
         /// <param name="additionalColumns"> Specifies the additional columns to be added to source data. Type: array of objects(AdditionalColumns) (or Expression with resultType array of objects). </param>
         /// <param name="query"> A query to retrieve data from source. Type: string (or Expression with resultType string). </param>
-        internal ImpalaSource(string copySourceType, DataFactoryElement<int> sourceRetryCount, DataFactoryElement<string> sourceRetryWait, DataFactoryElement<int> maxConcurrentConnections, DataFactoryElement<bool> disableMetricsCollection, IDictionary<string, BinaryData> additionalProperties, DataFactoryElement<string> queryTimeout, BinaryData additionalColumns, DataFactoryElement<string> query) : base(copySourceType, sourceRetryCount, sourceRetryWait, maxConcurrentConnections, disableMetricsCollection, additionalProperties, queryTimeout, additionalColumns)
+        internal ImpalaSource(string copySourceType, DataFactoryElement<int> sourceRetryCount, DataFactoryElement<string> sourceRetryWait, DataFactoryElement<int> maxConcurrentConnections, DataFactoryElement<bool> disableMetricsCollection, IDictionary<string, DataFactoryElement<string>> additionalProperties, DataFactoryElement<string> queryTimeout, BinaryData additionalColumns, DataFactoryElement<string> query) : base(copySourceType, sourceRetryCount, sourceRetryWait, maxConcurrentConnections, disableMetricsCollection, additionalProperties, queryTimeout, additionalColumns)
         {
             Query = query;
             CopySourceType = copySourceType ?? "ImpalaSource";
diff --git a/src/AzureDataFactory.TestingFramework/Generated/Models/ImportSettings.cs b/src/AzureDataFactory.TestingFramework/Generated/Models/ImportSettings.cs
index c432560e..d2e26aee 100644
--- a/src/AzureDataFactory.TestingFramework/Generated/Models/ImportSettings.cs
+++ b/src/AzureDataFactory.TestingFramework/Generated/Models/ImportSettings.cs
@@ -6,6 +6,7 @@
 #nullable disable
 
 using Azure.Core;
+using Azure.Core.Expressions.DataFactory;
 
 namespace AzureDataFactory.TestingFramework.Models
 {
@@ -19,13 +20,13 @@ public partial class ImportSettings
         /// <summary> Initializes a new instance of ImportSettings. </summary>
         public ImportSettings()
         {
-            AdditionalProperties = new ChangeTrackingDictionary<string, BinaryData>();
+            AdditionalProperties = new ChangeTrackingDictionary<string, DataFactoryElement<string>>();
         }
 
         /// <summary> Initializes a new instance of ImportSettings. </summary>
         /// <param name="importSettingsType"> The import setting type. </param>
         /// <param name="additionalProperties"> Additional Properties. </param>
-        internal ImportSettings(string importSettingsType, IDictionary<string, BinaryData> additionalProperties)
+        internal ImportSettings(string importSettingsType, IDictionary<string, DataFactoryElement<string>> additionalProperties)
         {
             ImportSettingsType = importSettingsType;
             AdditionalProperties = additionalProperties;
@@ -63,6 +64,6 @@ internal ImportSettings(string importSettingsType, IDictionary<string, BinaryDat
         /// </list>
         /// </para>
         /// </summary>
-        public IDictionary<string, BinaryData> AdditionalProperties { get; }
+        public IDictionary<string, DataFactoryElement<string>> AdditionalProperties { get; }
     }
 }
diff --git a/src/AzureDataFactory.TestingFramework/Generated/Models/InformixLinkedService.Serialization.cs b/src/AzureDataFactory.TestingFramework/Generated/Models/InformixLinkedService.Serialization.cs
index 973588fa..c340a392 100644
--- a/src/AzureDataFactory.TestingFramework/Generated/Models/InformixLinkedService.Serialization.cs
+++ b/src/AzureDataFactory.TestingFramework/Generated/Models/InformixLinkedService.Serialization.cs
@@ -117,8 +117,8 @@ internal static InformixLinkedService DeserializeInformixLinkedService(JsonEleme
             Optional<DataFactoryElement<string>> userName = default;
             Optional<DataFactorySecretBaseDefinition> password = default;
             Optional<string> encryptedCredential = default;
-            IDictionary<string, BinaryData> additionalProperties = default;
-            Dictionary<string, BinaryData> additionalPropertiesDictionary = new Dictionary<string, BinaryData>();
+            IDictionary<string, DataFactoryElement<string>> additionalProperties = default;
+            Dictionary<string, DataFactoryElement<string>> additionalPropertiesDictionary = new Dictionary<string, DataFactoryElement<string>>();
             foreach (var property in element.EnumerateObject())
             {
                 if (property.NameEquals("type"u8))
@@ -233,7 +233,7 @@ internal static InformixLinkedService DeserializeInformixLinkedService(JsonEleme
                     }
                     continue;
                 }
-                additionalPropertiesDictionary.Add(property.Name, BinaryData.FromString(property.Value.GetRawText()));
+                additionalPropertiesDictionary.Add(property.Name, JsonSerializer.Deserialize<DataFactoryElement<string>>(property.Value.GetRawText()));
             }
             additionalProperties = additionalPropertiesDictionary;
             return new InformixLinkedService(type, connectVia.Value, description.Value, Optional.ToDictionary(parameters), Optional.ToList(annotations), additionalProperties, connectionString, authenticationType.Value, credential, userName.Value, password, encryptedCredential.Value);
diff --git a/src/AzureDataFactory.TestingFramework/Generated/Models/InformixLinkedService.cs b/src/AzureDataFactory.TestingFramework/Generated/Models/InformixLinkedService.cs
index 216a8b9c..f8db2ed4 100644
--- a/src/AzureDataFactory.TestingFramework/Generated/Models/InformixLinkedService.cs
+++ b/src/AzureDataFactory.TestingFramework/Generated/Models/InformixLinkedService.cs
@@ -37,7 +37,7 @@ public InformixLinkedService(DataFactoryElement<string> connectionString)
         /// <param name="userName"> User name for Basic authentication. Type: string (or Expression with resultType string). </param>
         /// <param name="password"> Password for Basic authentication. </param>
         /// <param name="encryptedCredential"> The encrypted credential used for authentication. Credentials are encrypted using the integration runtime credential manager. Type: string. </param>
-        internal InformixLinkedService(string linkedServiceType, IntegrationRuntimeReference connectVia, string description, IDictionary<string, EntityParameterSpecification> parameters, IList<BinaryData> annotations, IDictionary<string, BinaryData> additionalProperties, DataFactoryElement<string> connectionString, DataFactoryElement<string> authenticationType, DataFactorySecretBaseDefinition credential, DataFactoryElement<string> userName, DataFactorySecretBaseDefinition password, string encryptedCredential) : base(linkedServiceType, connectVia, description, parameters, annotations, additionalProperties)
+        internal InformixLinkedService(string linkedServiceType, IntegrationRuntimeReference connectVia, string description, IDictionary<string, EntityParameterSpecification> parameters, IList<BinaryData> annotations, IDictionary<string, DataFactoryElement<string>> additionalProperties, DataFactoryElement<string> connectionString, DataFactoryElement<string> authenticationType, DataFactorySecretBaseDefinition credential, DataFactoryElement<string> userName, DataFactorySecretBaseDefinition password, string encryptedCredential) : base(linkedServiceType, connectVia, description, parameters, annotations, additionalProperties)
         {
             ConnectionString = connectionString;
             AuthenticationType = authenticationType;
diff --git a/src/AzureDataFactory.TestingFramework/Generated/Models/InformixSink.Serialization.cs b/src/AzureDataFactory.TestingFramework/Generated/Models/InformixSink.Serialization.cs
index 89cc6c04..f56c9a81 100644
--- a/src/AzureDataFactory.TestingFramework/Generated/Models/InformixSink.Serialization.cs
+++ b/src/AzureDataFactory.TestingFramework/Generated/Models/InformixSink.Serialization.cs
@@ -79,8 +79,8 @@ internal static InformixSink DeserializeInformixSink(JsonElement element)
             Optional<DataFactoryElement<string>> sinkRetryWait = default;
             Optional<DataFactoryElement<int>> maxConcurrentConnections = default;
             Optional<DataFactoryElement<bool>> disableMetricsCollection = default;
-            IDictionary<string, BinaryData> additionalProperties = default;
-            Dictionary<string, BinaryData> additionalPropertiesDictionary = new Dictionary<string, BinaryData>();
+            IDictionary<string, DataFactoryElement<string>> additionalProperties = default;
+            Dictionary<string, DataFactoryElement<string>> additionalPropertiesDictionary = new Dictionary<string, DataFactoryElement<string>>();
             foreach (var property in element.EnumerateObject())
             {
                 if (property.NameEquals("preCopyScript"u8))
@@ -151,7 +151,7 @@ internal static InformixSink DeserializeInformixSink(JsonElement element)
                     disableMetricsCollection = JsonSerializer.Deserialize<DataFactoryElement<bool>>(property.Value.GetRawText());
                     continue;
                 }
-                additionalPropertiesDictionary.Add(property.Name, BinaryData.FromString(property.Value.GetRawText()));
+                additionalPropertiesDictionary.Add(property.Name, JsonSerializer.Deserialize<DataFactoryElement<string>>(property.Value.GetRawText()));
             }
             additionalProperties = additionalPropertiesDictionary;
             return new InformixSink(type, writeBatchSize.Value, writeBatchTimeout.Value, sinkRetryCount.Value, sinkRetryWait.Value, maxConcurrentConnections.Value, disableMetricsCollection.Value, additionalProperties, preCopyScript.Value);
diff --git a/src/AzureDataFactory.TestingFramework/Generated/Models/InformixSink.cs b/src/AzureDataFactory.TestingFramework/Generated/Models/InformixSink.cs
index e35f629c..9bc82ad4 100644
--- a/src/AzureDataFactory.TestingFramework/Generated/Models/InformixSink.cs
+++ b/src/AzureDataFactory.TestingFramework/Generated/Models/InformixSink.cs
@@ -28,7 +28,7 @@ public InformixSink()
         /// <param name="disableMetricsCollection"> If true, disable data store metrics collection. Default is false. Type: boolean (or Expression with resultType boolean). </param>
         /// <param name="additionalProperties"> Additional Properties. </param>
         /// <param name="preCopyScript"> A query to execute before starting the copy. Type: string (or Expression with resultType string). </param>
-        internal InformixSink(string copySinkType, DataFactoryElement<int> writeBatchSize, DataFactoryElement<string> writeBatchTimeout, DataFactoryElement<int> sinkRetryCount, DataFactoryElement<string> sinkRetryWait, DataFactoryElement<int> maxConcurrentConnections, DataFactoryElement<bool> disableMetricsCollection, IDictionary<string, BinaryData> additionalProperties, DataFactoryElement<string> preCopyScript) : base(copySinkType, writeBatchSize, writeBatchTimeout, sinkRetryCount, sinkRetryWait, maxConcurrentConnections, disableMetricsCollection, additionalProperties)
+        internal InformixSink(string copySinkType, DataFactoryElement<int> writeBatchSize, DataFactoryElement<string> writeBatchTimeout, DataFactoryElement<int> sinkRetryCount, DataFactoryElement<string> sinkRetryWait, DataFactoryElement<int> maxConcurrentConnections, DataFactoryElement<bool> disableMetricsCollection, IDictionary<string, DataFactoryElement<string>> additionalProperties, DataFactoryElement<string> preCopyScript) : base(copySinkType, writeBatchSize, writeBatchTimeout, sinkRetryCount, sinkRetryWait, maxConcurrentConnections, disableMetricsCollection, additionalProperties)
         {
             PreCopyScript = preCopyScript;
             CopySinkType = copySinkType ?? "InformixSink";
diff --git a/src/AzureDataFactory.TestingFramework/Generated/Models/InformixSource.Serialization.cs b/src/AzureDataFactory.TestingFramework/Generated/Models/InformixSource.Serialization.cs
index b0a70d84..5a1ef93f 100644
--- a/src/AzureDataFactory.TestingFramework/Generated/Models/InformixSource.Serialization.cs
+++ b/src/AzureDataFactory.TestingFramework/Generated/Models/InformixSource.Serialization.cs
@@ -83,8 +83,8 @@ internal static InformixSource DeserializeInformixSource(JsonElement element)
             Optional<DataFactoryElement<string>> sourceRetryWait = default;
             Optional<DataFactoryElement<int>> maxConcurrentConnections = default;
             Optional<DataFactoryElement<bool>> disableMetricsCollection = default;
-            IDictionary<string, BinaryData> additionalProperties = default;
-            Dictionary<string, BinaryData> additionalPropertiesDictionary = new Dictionary<string, BinaryData>();
+            IDictionary<string, DataFactoryElement<string>> additionalProperties = default;
+            Dictionary<string, DataFactoryElement<string>> additionalPropertiesDictionary = new Dictionary<string, DataFactoryElement<string>>();
             foreach (var property in element.EnumerateObject())
             {
                 if (property.NameEquals("query"u8))
@@ -155,7 +155,7 @@ internal static InformixSource DeserializeInformixSource(JsonElement element)
                     disableMetricsCollection = JsonSerializer.Deserialize<DataFactoryElement<bool>>(property.Value.GetRawText());
                     continue;
                 }
-                additionalPropertiesDictionary.Add(property.Name, BinaryData.FromString(property.Value.GetRawText()));
+                additionalPropertiesDictionary.Add(property.Name, JsonSerializer.Deserialize<DataFactoryElement<string>>(property.Value.GetRawText()));
             }
             additionalProperties = additionalPropertiesDictionary;
             return new InformixSource(type, sourceRetryCount.Value, sourceRetryWait.Value, maxConcurrentConnections.Value, disableMetricsCollection.Value, additionalProperties, queryTimeout.Value, additionalColumns.Value, query.Value);
diff --git a/src/AzureDataFactory.TestingFramework/Generated/Models/InformixSource.cs b/src/AzureDataFactory.TestingFramework/Generated/Models/InformixSource.cs
index 1a66210c..e362a148 100644
--- a/src/AzureDataFactory.TestingFramework/Generated/Models/InformixSource.cs
+++ b/src/AzureDataFactory.TestingFramework/Generated/Models/InformixSource.cs
@@ -28,7 +28,7 @@ public InformixSource()
         /// <param name="queryTimeout"> Query timeout. Type: string (or Expression with resultType string), pattern: ((\d+)\.)?(\d\d):(60|([0-5][0-9])):(60|([0-5][0-9])). </param>
         /// <param name="additionalColumns"> Specifies the additional columns to be added to source data. Type: array of objects(AdditionalColumns) (or Expression with resultType array of objects). </param>
         /// <param name="query"> Database query. Type: string (or Expression with resultType string). </param>
-        internal InformixSource(string copySourceType, DataFactoryElement<int> sourceRetryCount, DataFactoryElement<string> sourceRetryWait, DataFactoryElement<int> maxConcurrentConnections, DataFactoryElement<bool> disableMetricsCollection, IDictionary<string, BinaryData> additionalProperties, DataFactoryElement<string> queryTimeout, BinaryData additionalColumns, DataFactoryElement<string> query) : base(copySourceType, sourceRetryCount, sourceRetryWait, maxConcurrentConnections, disableMetricsCollection, additionalProperties, queryTimeout, additionalColumns)
+        internal InformixSource(string copySourceType, DataFactoryElement<int> sourceRetryCount, DataFactoryElement<string> sourceRetryWait, DataFactoryElement<int> maxConcurrentConnections, DataFactoryElement<bool> disableMetricsCollection, IDictionary<string, DataFactoryElement<string>> additionalProperties, DataFactoryElement<string> queryTimeout, BinaryData additionalColumns, DataFactoryElement<string> query) : base(copySourceType, sourceRetryCount, sourceRetryWait, maxConcurrentConnections, disableMetricsCollection, additionalProperties, queryTimeout, additionalColumns)
         {
             Query = query;
             CopySourceType = copySourceType ?? "InformixSource";
diff --git a/src/AzureDataFactory.TestingFramework/Generated/Models/InformixTableDataset.Serialization.cs b/src/AzureDataFactory.TestingFramework/Generated/Models/InformixTableDataset.Serialization.cs
index 4bd8837f..dfa09d52 100644
--- a/src/AzureDataFactory.TestingFramework/Generated/Models/InformixTableDataset.Serialization.cs
+++ b/src/AzureDataFactory.TestingFramework/Generated/Models/InformixTableDataset.Serialization.cs
@@ -104,8 +104,8 @@ internal static InformixTableDataset DeserializeInformixTableDataset(JsonElement
             Optional<IList<BinaryData>> annotations = default;
             Optional<DatasetFolder> folder = default;
             Optional<DataFactoryElement<string>> tableName = default;
-            IDictionary<string, BinaryData> additionalProperties = default;
-            Dictionary<string, BinaryData> additionalPropertiesDictionary = new Dictionary<string, BinaryData>();
+            IDictionary<string, DataFactoryElement<string>> additionalProperties = default;
+            Dictionary<string, DataFactoryElement<string>> additionalPropertiesDictionary = new Dictionary<string, DataFactoryElement<string>>();
             foreach (var property in element.EnumerateObject())
             {
                 if (property.NameEquals("type"u8))
@@ -206,7 +206,7 @@ internal static InformixTableDataset DeserializeInformixTableDataset(JsonElement
                     }
                     continue;
                 }
-                additionalPropertiesDictionary.Add(property.Name, BinaryData.FromString(property.Value.GetRawText()));
+                additionalPropertiesDictionary.Add(property.Name, JsonSerializer.Deserialize<DataFactoryElement<string>>(property.Value.GetRawText()));
             }
             additionalProperties = additionalPropertiesDictionary;
             return new InformixTableDataset(type, description.Value, structure.Value, schema.Value, linkedServiceName, Optional.ToDictionary(parameters), Optional.ToList(annotations), folder.Value, additionalProperties, tableName.Value);
diff --git a/src/AzureDataFactory.TestingFramework/Generated/Models/InformixTableDataset.cs b/src/AzureDataFactory.TestingFramework/Generated/Models/InformixTableDataset.cs
index 2834690e..46575d10 100644
--- a/src/AzureDataFactory.TestingFramework/Generated/Models/InformixTableDataset.cs
+++ b/src/AzureDataFactory.TestingFramework/Generated/Models/InformixTableDataset.cs
@@ -34,7 +34,7 @@ public InformixTableDataset(DataFactoryLinkedServiceReference linkedServiceName)
         /// <param name="folder"> The folder that this Dataset is in. If not specified, Dataset will appear at the root level. </param>
         /// <param name="additionalProperties"> Additional Properties. </param>
         /// <param name="tableName"> The Informix table name. Type: string (or Expression with resultType string). </param>
-        internal InformixTableDataset(string datasetType, string description, DataFactoryElement<IList<DatasetDataElement>> structure, DataFactoryElement<IList<DatasetSchemaDataElement>> schema, DataFactoryLinkedServiceReference linkedServiceName, IDictionary<string, EntityParameterSpecification> parameters, IList<BinaryData> annotations, DatasetFolder folder, IDictionary<string, BinaryData> additionalProperties, DataFactoryElement<string> tableName) : base(datasetType, description, structure, schema, linkedServiceName, parameters, annotations, folder, additionalProperties)
+        internal InformixTableDataset(string datasetType, string description, DataFactoryElement<IList<DatasetDataElement>> structure, DataFactoryElement<IList<DatasetSchemaDataElement>> schema, DataFactoryLinkedServiceReference linkedServiceName, IDictionary<string, EntityParameterSpecification> parameters, IList<BinaryData> annotations, DatasetFolder folder, IDictionary<string, DataFactoryElement<string>> additionalProperties, DataFactoryElement<string> tableName) : base(datasetType, description, structure, schema, linkedServiceName, parameters, annotations, folder, additionalProperties)
         {
             TableName = tableName;
             DatasetType = datasetType ?? "InformixTable";
diff --git a/src/AzureDataFactory.TestingFramework/Generated/Models/IntegrationRuntimeComputeProperties.Serialization.cs b/src/AzureDataFactory.TestingFramework/Generated/Models/IntegrationRuntimeComputeProperties.Serialization.cs
index 15375896..307f4c2b 100644
--- a/src/AzureDataFactory.TestingFramework/Generated/Models/IntegrationRuntimeComputeProperties.Serialization.cs
+++ b/src/AzureDataFactory.TestingFramework/Generated/Models/IntegrationRuntimeComputeProperties.Serialization.cs
@@ -7,6 +7,7 @@
 
 using System.Text.Json;
 using Azure.Core;
+using Azure.Core.Expressions.DataFactory;
 
 namespace AzureDataFactory.TestingFramework.Models
 {
@@ -81,8 +82,8 @@ internal static IntegrationRuntimeComputeProperties DeserializeIntegrationRuntim
             Optional<IntegrationRuntimeVnetProperties> vnetProperties = default;
             Optional<CopyComputeScaleProperties> copyComputeScaleProperties = default;
             Optional<PipelineExternalComputeScaleProperties> pipelineExternalComputeScaleProperties = default;
-            IDictionary<string, BinaryData> additionalProperties = default;
-            Dictionary<string, BinaryData> additionalPropertiesDictionary = new Dictionary<string, BinaryData>();
+            IDictionary<string, DataFactoryElement<string>> additionalProperties = default;
+            Dictionary<string, DataFactoryElement<string>> additionalPropertiesDictionary = new Dictionary<string, DataFactoryElement<string>>();
             foreach (var property in element.EnumerateObject())
             {
                 if (property.NameEquals("location"u8))
@@ -153,7 +154,7 @@ internal static IntegrationRuntimeComputeProperties DeserializeIntegrationRuntim
                     pipelineExternalComputeScaleProperties = PipelineExternalComputeScaleProperties.DeserializePipelineExternalComputeScaleProperties(property.Value);
                     continue;
                 }
-                additionalPropertiesDictionary.Add(property.Name, BinaryData.FromString(property.Value.GetRawText()));
+                additionalPropertiesDictionary.Add(property.Name, JsonSerializer.Deserialize<DataFactoryElement<string>>(property.Value.GetRawText()));
             }
             additionalProperties = additionalPropertiesDictionary;
             return new IntegrationRuntimeComputeProperties(Optional.ToNullable(location), nodeSize.Value, Optional.ToNullable(numberOfNodes), Optional.ToNullable(maxParallelExecutionsPerNode), dataFlowProperties.Value, vnetProperties.Value, copyComputeScaleProperties.Value, pipelineExternalComputeScaleProperties.Value, additionalProperties);
diff --git a/src/AzureDataFactory.TestingFramework/Generated/Models/IntegrationRuntimeComputeProperties.cs b/src/AzureDataFactory.TestingFramework/Generated/Models/IntegrationRuntimeComputeProperties.cs
index d3e1f7ab..d72d06f1 100644
--- a/src/AzureDataFactory.TestingFramework/Generated/Models/IntegrationRuntimeComputeProperties.cs
+++ b/src/AzureDataFactory.TestingFramework/Generated/Models/IntegrationRuntimeComputeProperties.cs
@@ -6,6 +6,7 @@
 #nullable disable
 
 using Azure.Core;
+using Azure.Core.Expressions.DataFactory;
 
 namespace AzureDataFactory.TestingFramework.Models
 {
@@ -15,7 +16,7 @@ public partial class IntegrationRuntimeComputeProperties
         /// <summary> Initializes a new instance of IntegrationRuntimeComputeProperties. </summary>
         public IntegrationRuntimeComputeProperties()
         {
-            AdditionalProperties = new ChangeTrackingDictionary<string, BinaryData>();
+            AdditionalProperties = new ChangeTrackingDictionary<string, DataFactoryElement<string>>();
         }
 
         /// <summary> Initializes a new instance of IntegrationRuntimeComputeProperties. </summary>
@@ -28,7 +29,7 @@ public IntegrationRuntimeComputeProperties()
         /// <param name="copyComputeScaleProperties"> CopyComputeScale properties for managed integration runtime. </param>
         /// <param name="pipelineExternalComputeScaleProperties"> PipelineExternalComputeScale properties for managed integration runtime. </param>
         /// <param name="additionalProperties"> Additional Properties. </param>
-        internal IntegrationRuntimeComputeProperties(AzureLocation? location, string nodeSize, int? numberOfNodes, int? maxParallelExecutionsPerNode, IntegrationRuntimeDataFlowProperties dataFlowProperties, IntegrationRuntimeVnetProperties vnetProperties, CopyComputeScaleProperties copyComputeScaleProperties, PipelineExternalComputeScaleProperties pipelineExternalComputeScaleProperties, IDictionary<string, BinaryData> additionalProperties)
+        internal IntegrationRuntimeComputeProperties(AzureLocation? location, string nodeSize, int? numberOfNodes, int? maxParallelExecutionsPerNode, IntegrationRuntimeDataFlowProperties dataFlowProperties, IntegrationRuntimeVnetProperties vnetProperties, CopyComputeScaleProperties copyComputeScaleProperties, PipelineExternalComputeScaleProperties pipelineExternalComputeScaleProperties, IDictionary<string, DataFactoryElement<string>> additionalProperties)
         {
             Location = location;
             NodeSize = nodeSize;
@@ -87,6 +88,6 @@ internal IntegrationRuntimeComputeProperties(AzureLocation? location, string nod
         /// </list>
         /// </para>
         /// </summary>
-        public IDictionary<string, BinaryData> AdditionalProperties { get; }
+        public IDictionary<string, DataFactoryElement<string>> AdditionalProperties { get; }
     }
 }
diff --git a/src/AzureDataFactory.TestingFramework/Generated/Models/IntegrationRuntimeConnectionInfo.Serialization.cs b/src/AzureDataFactory.TestingFramework/Generated/Models/IntegrationRuntimeConnectionInfo.Serialization.cs
index 8ab6bd71..0c10d449 100644
--- a/src/AzureDataFactory.TestingFramework/Generated/Models/IntegrationRuntimeConnectionInfo.Serialization.cs
+++ b/src/AzureDataFactory.TestingFramework/Generated/Models/IntegrationRuntimeConnectionInfo.Serialization.cs
@@ -7,6 +7,7 @@
 
 using System.Text.Json;
 using Azure.Core;
+using Azure.Core.Expressions.DataFactory;
 
 namespace AzureDataFactory.TestingFramework.Models
 {
@@ -24,8 +25,8 @@ internal static IntegrationRuntimeConnectionInfo DeserializeIntegrationRuntimeCo
             Optional<string> version = default;
             Optional<string> publicKey = default;
             Optional<bool> isIdentityCertExprired = default;
-            IReadOnlyDictionary<string, BinaryData> additionalProperties = default;
-            Dictionary<string, BinaryData> additionalPropertiesDictionary = new Dictionary<string, BinaryData>();
+            IReadOnlyDictionary<string, DataFactoryElement<string>> additionalProperties = default;
+            Dictionary<string, DataFactoryElement<string>> additionalPropertiesDictionary = new Dictionary<string, DataFactoryElement<string>>();
             foreach (var property in element.EnumerateObject())
             {
                 if (property.NameEquals("serviceToken"u8))
@@ -66,7 +67,7 @@ internal static IntegrationRuntimeConnectionInfo DeserializeIntegrationRuntimeCo
                     isIdentityCertExprired = property.Value.GetBoolean();
                     continue;
                 }
-                additionalPropertiesDictionary.Add(property.Name, BinaryData.FromString(property.Value.GetRawText()));
+                additionalPropertiesDictionary.Add(property.Name, JsonSerializer.Deserialize<DataFactoryElement<string>>(property.Value.GetRawText()));
             }
             additionalProperties = additionalPropertiesDictionary;
             return new IntegrationRuntimeConnectionInfo(serviceToken.Value, identityCertThumbprint.Value, hostServiceUri.Value, version.Value, publicKey.Value, Optional.ToNullable(isIdentityCertExprired), additionalProperties);
diff --git a/src/AzureDataFactory.TestingFramework/Generated/Models/IntegrationRuntimeConnectionInfo.cs b/src/AzureDataFactory.TestingFramework/Generated/Models/IntegrationRuntimeConnectionInfo.cs
index 5cdba317..6ada5cfc 100644
--- a/src/AzureDataFactory.TestingFramework/Generated/Models/IntegrationRuntimeConnectionInfo.cs
+++ b/src/AzureDataFactory.TestingFramework/Generated/Models/IntegrationRuntimeConnectionInfo.cs
@@ -6,6 +6,7 @@
 #nullable disable
 
 using Azure.Core;
+using Azure.Core.Expressions.DataFactory;
 
 namespace AzureDataFactory.TestingFramework.Models
 {
@@ -15,7 +16,7 @@ public partial class IntegrationRuntimeConnectionInfo
         /// <summary> Initializes a new instance of IntegrationRuntimeConnectionInfo. </summary>
         internal IntegrationRuntimeConnectionInfo()
         {
-            AdditionalProperties = new ChangeTrackingDictionary<string, BinaryData>();
+            AdditionalProperties = new ChangeTrackingDictionary<string, DataFactoryElement<string>>();
         }
 
         /// <summary> Initializes a new instance of IntegrationRuntimeConnectionInfo. </summary>
@@ -26,7 +27,7 @@ internal IntegrationRuntimeConnectionInfo()
         /// <param name="publicKey"> The public key for encrypting a credential when transferring the credential to the integration runtime. </param>
         /// <param name="isIdentityCertExprired"> Whether the identity certificate is expired. </param>
         /// <param name="additionalProperties"> Additional Properties. </param>
-        internal IntegrationRuntimeConnectionInfo(string serviceToken, string identityCertThumbprint, Uri hostServiceUri, string version, string publicKey, bool? isIdentityCertExprired, IReadOnlyDictionary<string, BinaryData> additionalProperties)
+        internal IntegrationRuntimeConnectionInfo(string serviceToken, string identityCertThumbprint, Uri hostServiceUri, string version, string publicKey, bool? isIdentityCertExprired, IReadOnlyDictionary<string, DataFactoryElement<string>> additionalProperties)
         {
             ServiceToken = serviceToken;
             IdentityCertThumbprint = identityCertThumbprint;
@@ -79,6 +80,6 @@ internal IntegrationRuntimeConnectionInfo(string serviceToken, string identityCe
         /// </list>
         /// </para>
         /// </summary>
-        public IReadOnlyDictionary<string, BinaryData> AdditionalProperties { get; }
+        public IReadOnlyDictionary<string, DataFactoryElement<string>> AdditionalProperties { get; }
     }
 }
diff --git a/src/AzureDataFactory.TestingFramework/Generated/Models/IntegrationRuntimeDataFlowProperties.Serialization.cs b/src/AzureDataFactory.TestingFramework/Generated/Models/IntegrationRuntimeDataFlowProperties.Serialization.cs
index 46330819..a1f87990 100644
--- a/src/AzureDataFactory.TestingFramework/Generated/Models/IntegrationRuntimeDataFlowProperties.Serialization.cs
+++ b/src/AzureDataFactory.TestingFramework/Generated/Models/IntegrationRuntimeDataFlowProperties.Serialization.cs
@@ -7,6 +7,7 @@
 
 using System.Text.Json;
 using Azure.Core;
+using Azure.Core.Expressions.DataFactory;
 
 namespace AzureDataFactory.TestingFramework.Models
 {
@@ -68,8 +69,8 @@ internal static IntegrationRuntimeDataFlowProperties DeserializeIntegrationRunti
             Optional<int> timeToLive = default;
             Optional<bool> cleanup = default;
             Optional<IList<IntegrationRuntimeDataFlowCustomItem>> customProperties = default;
-            IDictionary<string, BinaryData> additionalProperties = default;
-            Dictionary<string, BinaryData> additionalPropertiesDictionary = new Dictionary<string, BinaryData>();
+            IDictionary<string, DataFactoryElement<string>> additionalProperties = default;
+            Dictionary<string, DataFactoryElement<string>> additionalPropertiesDictionary = new Dictionary<string, DataFactoryElement<string>>();
             foreach (var property in element.EnumerateObject())
             {
                 if (property.NameEquals("computeType"u8))
@@ -122,7 +123,7 @@ internal static IntegrationRuntimeDataFlowProperties DeserializeIntegrationRunti
                     customProperties = array;
                     continue;
                 }
-                additionalPropertiesDictionary.Add(property.Name, BinaryData.FromString(property.Value.GetRawText()));
+                additionalPropertiesDictionary.Add(property.Name, JsonSerializer.Deserialize<DataFactoryElement<string>>(property.Value.GetRawText()));
             }
             additionalProperties = additionalPropertiesDictionary;
             return new IntegrationRuntimeDataFlowProperties(Optional.ToNullable(computeType), Optional.ToNullable(coreCount), Optional.ToNullable(timeToLive), Optional.ToNullable(cleanup), Optional.ToList(customProperties), additionalProperties);
diff --git a/src/AzureDataFactory.TestingFramework/Generated/Models/IntegrationRuntimeDataFlowProperties.cs b/src/AzureDataFactory.TestingFramework/Generated/Models/IntegrationRuntimeDataFlowProperties.cs
index f44179ee..6775f7c9 100644
--- a/src/AzureDataFactory.TestingFramework/Generated/Models/IntegrationRuntimeDataFlowProperties.cs
+++ b/src/AzureDataFactory.TestingFramework/Generated/Models/IntegrationRuntimeDataFlowProperties.cs
@@ -6,6 +6,7 @@
 #nullable disable
 
 using Azure.Core;
+using Azure.Core.Expressions.DataFactory;
 
 namespace AzureDataFactory.TestingFramework.Models
 {
@@ -16,7 +17,7 @@ public partial class IntegrationRuntimeDataFlowProperties
         public IntegrationRuntimeDataFlowProperties()
         {
             CustomProperties = new ChangeTrackingList<IntegrationRuntimeDataFlowCustomItem>();
-            AdditionalProperties = new ChangeTrackingDictionary<string, BinaryData>();
+            AdditionalProperties = new ChangeTrackingDictionary<string, DataFactoryElement<string>>();
         }
 
         /// <summary> Initializes a new instance of IntegrationRuntimeDataFlowProperties. </summary>
@@ -26,7 +27,7 @@ public IntegrationRuntimeDataFlowProperties()
         /// <param name="shouldCleanupAfterTtl"> Cluster will not be recycled and it will be used in next data flow activity run until TTL (time to live) is reached if this is set as false. Default is true. </param>
         /// <param name="customProperties"> Custom properties are used to tune the data flow runtime performance. </param>
         /// <param name="additionalProperties"> Additional Properties. </param>
-        internal IntegrationRuntimeDataFlowProperties(DataFlowComputeType? computeType, int? coreCount, int? timeToLiveInMinutes, bool? shouldCleanupAfterTtl, IList<IntegrationRuntimeDataFlowCustomItem> customProperties, IDictionary<string, BinaryData> additionalProperties)
+        internal IntegrationRuntimeDataFlowProperties(DataFlowComputeType? computeType, int? coreCount, int? timeToLiveInMinutes, bool? shouldCleanupAfterTtl, IList<IntegrationRuntimeDataFlowCustomItem> customProperties, IDictionary<string, DataFactoryElement<string>> additionalProperties)
         {
             ComputeType = computeType;
             CoreCount = coreCount;
@@ -76,6 +77,6 @@ internal IntegrationRuntimeDataFlowProperties(DataFlowComputeType? computeType,
         /// </list>
         /// </para>
         /// </summary>
-        public IDictionary<string, BinaryData> AdditionalProperties { get; }
+        public IDictionary<string, DataFactoryElement<string>> AdditionalProperties { get; }
     }
 }
diff --git a/src/AzureDataFactory.TestingFramework/Generated/Models/IntegrationRuntimeNodeMonitoringData.Serialization.cs b/src/AzureDataFactory.TestingFramework/Generated/Models/IntegrationRuntimeNodeMonitoringData.Serialization.cs
index 2c25131d..73ee9733 100644
--- a/src/AzureDataFactory.TestingFramework/Generated/Models/IntegrationRuntimeNodeMonitoringData.Serialization.cs
+++ b/src/AzureDataFactory.TestingFramework/Generated/Models/IntegrationRuntimeNodeMonitoringData.Serialization.cs
@@ -7,6 +7,7 @@
 
 using System.Text.Json;
 using Azure.Core;
+using Azure.Core.Expressions.DataFactory;
 
 namespace AzureDataFactory.TestingFramework.Models
 {
@@ -26,8 +27,8 @@ internal static IntegrationRuntimeNodeMonitoringData DeserializeIntegrationRunti
             Optional<int> maxConcurrentJobs = default;
             Optional<float> sentBytes = default;
             Optional<float> receivedBytes = default;
-            IReadOnlyDictionary<string, BinaryData> additionalProperties = default;
-            Dictionary<string, BinaryData> additionalPropertiesDictionary = new Dictionary<string, BinaryData>();
+            IReadOnlyDictionary<string, DataFactoryElement<string>> additionalProperties = default;
+            Dictionary<string, DataFactoryElement<string>> additionalPropertiesDictionary = new Dictionary<string, DataFactoryElement<string>>();
             foreach (var property in element.EnumerateObject())
             {
                 if (property.NameEquals("nodeName"u8))
@@ -98,7 +99,7 @@ internal static IntegrationRuntimeNodeMonitoringData DeserializeIntegrationRunti
                     receivedBytes = property.Value.GetSingle();
                     continue;
                 }
-                additionalPropertiesDictionary.Add(property.Name, BinaryData.FromString(property.Value.GetRawText()));
+                additionalPropertiesDictionary.Add(property.Name, JsonSerializer.Deserialize<DataFactoryElement<string>>(property.Value.GetRawText()));
             }
             additionalProperties = additionalPropertiesDictionary;
             return new IntegrationRuntimeNodeMonitoringData(nodeName.Value, Optional.ToNullable(availableMemoryInMB), Optional.ToNullable(cpuUtilization), Optional.ToNullable(concurrentJobsLimit), Optional.ToNullable(concurrentJobsRunning), Optional.ToNullable(maxConcurrentJobs), Optional.ToNullable(sentBytes), Optional.ToNullable(receivedBytes), additionalProperties);
diff --git a/src/AzureDataFactory.TestingFramework/Generated/Models/IntegrationRuntimeNodeMonitoringData.cs b/src/AzureDataFactory.TestingFramework/Generated/Models/IntegrationRuntimeNodeMonitoringData.cs
index 0fbacee5..c3b822c0 100644
--- a/src/AzureDataFactory.TestingFramework/Generated/Models/IntegrationRuntimeNodeMonitoringData.cs
+++ b/src/AzureDataFactory.TestingFramework/Generated/Models/IntegrationRuntimeNodeMonitoringData.cs
@@ -6,6 +6,7 @@
 #nullable disable
 
 using Azure.Core;
+using Azure.Core.Expressions.DataFactory;
 
 namespace AzureDataFactory.TestingFramework.Models
 {
@@ -15,7 +16,7 @@ public partial class IntegrationRuntimeNodeMonitoringData
         /// <summary> Initializes a new instance of IntegrationRuntimeNodeMonitoringData. </summary>
         internal IntegrationRuntimeNodeMonitoringData()
         {
-            AdditionalProperties = new ChangeTrackingDictionary<string, BinaryData>();
+            AdditionalProperties = new ChangeTrackingDictionary<string, DataFactoryElement<string>>();
         }
 
         /// <summary> Initializes a new instance of IntegrationRuntimeNodeMonitoringData. </summary>
@@ -28,7 +29,7 @@ internal IntegrationRuntimeNodeMonitoringData()
         /// <param name="sentBytes"> Sent bytes on the integration runtime node. </param>
         /// <param name="receivedBytes"> Received bytes on the integration runtime node. </param>
         /// <param name="additionalProperties"> Additional Properties. </param>
-        internal IntegrationRuntimeNodeMonitoringData(string nodeName, int? availableMemoryInMB, int? cpuUtilization, int? concurrentJobsLimit, int? concurrentJobsRunning, int? maxConcurrentJobs, float? sentBytes, float? receivedBytes, IReadOnlyDictionary<string, BinaryData> additionalProperties)
+        internal IntegrationRuntimeNodeMonitoringData(string nodeName, int? availableMemoryInMB, int? cpuUtilization, int? concurrentJobsLimit, int? concurrentJobsRunning, int? maxConcurrentJobs, float? sentBytes, float? receivedBytes, IReadOnlyDictionary<string, DataFactoryElement<string>> additionalProperties)
         {
             NodeName = nodeName;
             AvailableMemoryInMB = availableMemoryInMB;
@@ -87,6 +88,6 @@ internal IntegrationRuntimeNodeMonitoringData(string nodeName, int? availableMem
         /// </list>
         /// </para>
         /// </summary>
-        public IReadOnlyDictionary<string, BinaryData> AdditionalProperties { get; }
+        public IReadOnlyDictionary<string, DataFactoryElement<string>> AdditionalProperties { get; }
     }
 }
diff --git a/src/AzureDataFactory.TestingFramework/Generated/Models/IntegrationRuntimeReference.Serialization.cs b/src/AzureDataFactory.TestingFramework/Generated/Models/IntegrationRuntimeReference.Serialization.cs
index e05266fd..856c5c59 100644
--- a/src/AzureDataFactory.TestingFramework/Generated/Models/IntegrationRuntimeReference.Serialization.cs
+++ b/src/AzureDataFactory.TestingFramework/Generated/Models/IntegrationRuntimeReference.Serialization.cs
@@ -7,6 +7,7 @@
 
 using System.Text.Json;
 using Azure.Core;
+using Azure.Core.Expressions.DataFactory;
 
 namespace AzureDataFactory.TestingFramework.Models
 {
@@ -50,7 +51,7 @@ internal static IntegrationRuntimeReference DeserializeIntegrationRuntimeReferen
             }
             IntegrationRuntimeReferenceType type = default;
             string referenceName = default;
-            Optional<IDictionary<string, BinaryData>> parameters = default;
+            Optional<IDictionary<string, DataFactoryElement<string>>> parameters = default;
             foreach (var property in element.EnumerateObject())
             {
                 if (property.NameEquals("type"u8))
@@ -69,7 +70,7 @@ internal static IntegrationRuntimeReference DeserializeIntegrationRuntimeReferen
                     {
                         continue;
                     }
-                    Dictionary<string, BinaryData> dictionary = new Dictionary<string, BinaryData>();
+                    Dictionary<string, DataFactoryElement<string>> dictionary = new Dictionary<string, DataFactoryElement<string>>();
                     foreach (var property0 in property.Value.EnumerateObject())
                     {
                         if (property0.Value.ValueKind == JsonValueKind.Null)
@@ -78,7 +79,7 @@ internal static IntegrationRuntimeReference DeserializeIntegrationRuntimeReferen
                         }
                         else
                         {
-                            dictionary.Add(property0.Name, BinaryData.FromString(property0.Value.GetRawText()));
+                            dictionary.Add(property0.Name, JsonSerializer.Deserialize<DataFactoryElement<string>>(property0.Value.GetRawText()));
                         }
                     }
                     parameters = dictionary;
diff --git a/src/AzureDataFactory.TestingFramework/Generated/Models/IntegrationRuntimeReference.cs b/src/AzureDataFactory.TestingFramework/Generated/Models/IntegrationRuntimeReference.cs
index 36d5cd3a..882d360c 100644
--- a/src/AzureDataFactory.TestingFramework/Generated/Models/IntegrationRuntimeReference.cs
+++ b/src/AzureDataFactory.TestingFramework/Generated/Models/IntegrationRuntimeReference.cs
@@ -6,6 +6,7 @@
 #nullable disable
 
 using Azure.Core;
+using Azure.Core.Expressions.DataFactory;
 
 namespace AzureDataFactory.TestingFramework.Models
 {
@@ -22,14 +23,14 @@ public IntegrationRuntimeReference(IntegrationRuntimeReferenceType referenceType
 
             ReferenceType = referenceType;
             ReferenceName = referenceName;
-            Parameters = new ChangeTrackingDictionary<string, BinaryData>();
+            Parameters = new ChangeTrackingDictionary<string, DataFactoryElement<string>>();
         }
 
         /// <summary> Initializes a new instance of IntegrationRuntimeReference. </summary>
         /// <param name="referenceType"> Type of integration runtime. </param>
         /// <param name="referenceName"> Reference integration runtime name. </param>
         /// <param name="parameters"> Arguments for integration runtime. </param>
-        internal IntegrationRuntimeReference(IntegrationRuntimeReferenceType referenceType, string referenceName, IDictionary<string, BinaryData> parameters)
+        internal IntegrationRuntimeReference(IntegrationRuntimeReferenceType referenceType, string referenceName, IDictionary<string, DataFactoryElement<string>> parameters)
         {
             ReferenceType = referenceType;
             ReferenceName = referenceName;
@@ -70,6 +71,6 @@ internal IntegrationRuntimeReference(IntegrationRuntimeReferenceType referenceTy
         /// </list>
         /// </para>
         /// </summary>
-        public IDictionary<string, BinaryData> Parameters { get; }
+        public IDictionary<string, DataFactoryElement<string>> Parameters { get; }
     }
 }
diff --git a/src/AzureDataFactory.TestingFramework/Generated/Models/IntegrationRuntimeSsisCatalogInfo.Serialization.cs b/src/AzureDataFactory.TestingFramework/Generated/Models/IntegrationRuntimeSsisCatalogInfo.Serialization.cs
index b58f5f5e..495b82f7 100644
--- a/src/AzureDataFactory.TestingFramework/Generated/Models/IntegrationRuntimeSsisCatalogInfo.Serialization.cs
+++ b/src/AzureDataFactory.TestingFramework/Generated/Models/IntegrationRuntimeSsisCatalogInfo.Serialization.cs
@@ -64,8 +64,8 @@ internal static IntegrationRuntimeSsisCatalogInfo DeserializeIntegrationRuntimeS
             Optional<DataFactorySecretString> catalogAdminPassword = default;
             Optional<IntegrationRuntimeSsisCatalogPricingTier> catalogPricingTier = default;
             Optional<string> dualStandbyPairName = default;
-            IDictionary<string, BinaryData> additionalProperties = default;
-            Dictionary<string, BinaryData> additionalPropertiesDictionary = new Dictionary<string, BinaryData>();
+            IDictionary<string, DataFactoryElement<string>> additionalProperties = default;
+            Dictionary<string, DataFactoryElement<string>> additionalPropertiesDictionary = new Dictionary<string, DataFactoryElement<string>>();
             foreach (var property in element.EnumerateObject())
             {
                 if (property.NameEquals("catalogServerEndpoint"u8))
@@ -101,7 +101,7 @@ internal static IntegrationRuntimeSsisCatalogInfo DeserializeIntegrationRuntimeS
                     dualStandbyPairName = property.Value.GetString();
                     continue;
                 }
-                additionalPropertiesDictionary.Add(property.Name, BinaryData.FromString(property.Value.GetRawText()));
+                additionalPropertiesDictionary.Add(property.Name, JsonSerializer.Deserialize<DataFactoryElement<string>>(property.Value.GetRawText()));
             }
             additionalProperties = additionalPropertiesDictionary;
             return new IntegrationRuntimeSsisCatalogInfo(catalogServerEndpoint.Value, catalogAdminUserName.Value, catalogAdminPassword, Optional.ToNullable(catalogPricingTier), dualStandbyPairName.Value, additionalProperties);
diff --git a/src/AzureDataFactory.TestingFramework/Generated/Models/IntegrationRuntimeSsisCatalogInfo.cs b/src/AzureDataFactory.TestingFramework/Generated/Models/IntegrationRuntimeSsisCatalogInfo.cs
index f983fdff..dd81e872 100644
--- a/src/AzureDataFactory.TestingFramework/Generated/Models/IntegrationRuntimeSsisCatalogInfo.cs
+++ b/src/AzureDataFactory.TestingFramework/Generated/Models/IntegrationRuntimeSsisCatalogInfo.cs
@@ -16,7 +16,7 @@ public partial class IntegrationRuntimeSsisCatalogInfo
         /// <summary> Initializes a new instance of IntegrationRuntimeSsisCatalogInfo. </summary>
         public IntegrationRuntimeSsisCatalogInfo()
         {
-            AdditionalProperties = new ChangeTrackingDictionary<string, BinaryData>();
+            AdditionalProperties = new ChangeTrackingDictionary<string, DataFactoryElement<string>>();
         }
 
         /// <summary> Initializes a new instance of IntegrationRuntimeSsisCatalogInfo. </summary>
@@ -26,7 +26,7 @@ public IntegrationRuntimeSsisCatalogInfo()
         /// <param name="catalogPricingTier"> The pricing tier for the catalog database. The valid values could be found in https://azure.microsoft.com/en-us/pricing/details/sql-database/. </param>
         /// <param name="dualStandbyPairName"> The dual standby pair name of Azure-SSIS Integration Runtimes to support SSISDB failover. </param>
         /// <param name="additionalProperties"> Additional Properties. </param>
-        internal IntegrationRuntimeSsisCatalogInfo(string catalogServerEndpoint, string catalogAdminUserName, DataFactorySecretString catalogAdminPassword, IntegrationRuntimeSsisCatalogPricingTier? catalogPricingTier, string dualStandbyPairName, IDictionary<string, BinaryData> additionalProperties)
+        internal IntegrationRuntimeSsisCatalogInfo(string catalogServerEndpoint, string catalogAdminUserName, DataFactorySecretString catalogAdminPassword, IntegrationRuntimeSsisCatalogPricingTier? catalogPricingTier, string dualStandbyPairName, IDictionary<string, DataFactoryElement<string>> additionalProperties)
         {
             CatalogServerEndpoint = catalogServerEndpoint;
             CatalogAdminUserName = catalogAdminUserName;
@@ -76,6 +76,6 @@ internal IntegrationRuntimeSsisCatalogInfo(string catalogServerEndpoint, string
         /// </list>
         /// </para>
         /// </summary>
-        public IDictionary<string, BinaryData> AdditionalProperties { get; }
+        public IDictionary<string, DataFactoryElement<string>> AdditionalProperties { get; }
     }
 }
diff --git a/src/AzureDataFactory.TestingFramework/Generated/Models/IntegrationRuntimeSsisProperties.Serialization.cs b/src/AzureDataFactory.TestingFramework/Generated/Models/IntegrationRuntimeSsisProperties.Serialization.cs
index f52b52ac..e3029ef9 100644
--- a/src/AzureDataFactory.TestingFramework/Generated/Models/IntegrationRuntimeSsisProperties.Serialization.cs
+++ b/src/AzureDataFactory.TestingFramework/Generated/Models/IntegrationRuntimeSsisProperties.Serialization.cs
@@ -7,6 +7,7 @@
 
 using System.Text.Json;
 using Azure.Core;
+using Azure.Core.Expressions.DataFactory;
 
 namespace AzureDataFactory.TestingFramework.Models
 {
@@ -91,8 +92,8 @@ internal static IntegrationRuntimeSsisProperties DeserializeIntegrationRuntimeSs
             Optional<IList<CustomSetupBase>> expressCustomSetupProperties = default;
             Optional<IList<DataFactoryPackageStore>> packageStores = default;
             Optional<DataFactoryCredentialReference> credential = default;
-            IDictionary<string, BinaryData> additionalProperties = default;
-            Dictionary<string, BinaryData> additionalPropertiesDictionary = new Dictionary<string, BinaryData>();
+            IDictionary<string, DataFactoryElement<string>> additionalProperties = default;
+            Dictionary<string, DataFactoryElement<string>> additionalPropertiesDictionary = new Dictionary<string, DataFactoryElement<string>>();
             foreach (var property in element.EnumerateObject())
             {
                 if (property.NameEquals("catalogInfo"u8))
@@ -177,7 +178,7 @@ internal static IntegrationRuntimeSsisProperties DeserializeIntegrationRuntimeSs
                     credential = DataFactoryCredentialReference.DeserializeDataFactoryCredentialReference(property.Value);
                     continue;
                 }
-                additionalPropertiesDictionary.Add(property.Name, BinaryData.FromString(property.Value.GetRawText()));
+                additionalPropertiesDictionary.Add(property.Name, JsonSerializer.Deserialize<DataFactoryElement<string>>(property.Value.GetRawText()));
             }
             additionalProperties = additionalPropertiesDictionary;
             return new IntegrationRuntimeSsisProperties(catalogInfo.Value, Optional.ToNullable(licenseType), customSetupScriptProperties.Value, dataProxyProperties.Value, Optional.ToNullable(edition), Optional.ToList(expressCustomSetupProperties), Optional.ToList(packageStores), credential.Value, additionalProperties);
diff --git a/src/AzureDataFactory.TestingFramework/Generated/Models/IntegrationRuntimeSsisProperties.cs b/src/AzureDataFactory.TestingFramework/Generated/Models/IntegrationRuntimeSsisProperties.cs
index aceb1356..840a6c05 100644
--- a/src/AzureDataFactory.TestingFramework/Generated/Models/IntegrationRuntimeSsisProperties.cs
+++ b/src/AzureDataFactory.TestingFramework/Generated/Models/IntegrationRuntimeSsisProperties.cs
@@ -6,6 +6,7 @@
 #nullable disable
 
 using Azure.Core;
+using Azure.Core.Expressions.DataFactory;
 
 namespace AzureDataFactory.TestingFramework.Models
 {
@@ -17,7 +18,7 @@ public IntegrationRuntimeSsisProperties()
         {
             ExpressCustomSetupProperties = new ChangeTrackingList<CustomSetupBase>();
             PackageStores = new ChangeTrackingList<DataFactoryPackageStore>();
-            AdditionalProperties = new ChangeTrackingDictionary<string, BinaryData>();
+            AdditionalProperties = new ChangeTrackingDictionary<string, DataFactoryElement<string>>();
         }
 
         /// <summary> Initializes a new instance of IntegrationRuntimeSsisProperties. </summary>
@@ -34,7 +35,7 @@ public IntegrationRuntimeSsisProperties()
         /// <param name="packageStores"> Package stores for the SSIS Integration Runtime. </param>
         /// <param name="credential"> The credential reference containing authentication information. </param>
         /// <param name="additionalProperties"> Additional Properties. </param>
-        internal IntegrationRuntimeSsisProperties(IntegrationRuntimeSsisCatalogInfo catalogInfo, IntegrationRuntimeLicenseType? licenseType, IntegrationRuntimeCustomSetupScriptProperties customSetupScriptProperties, IntegrationRuntimeDataProxyProperties dataProxyProperties, IntegrationRuntimeEdition? edition, IList<CustomSetupBase> expressCustomSetupProperties, IList<DataFactoryPackageStore> packageStores, DataFactoryCredentialReference credential, IDictionary<string, BinaryData> additionalProperties)
+        internal IntegrationRuntimeSsisProperties(IntegrationRuntimeSsisCatalogInfo catalogInfo, IntegrationRuntimeLicenseType? licenseType, IntegrationRuntimeCustomSetupScriptProperties customSetupScriptProperties, IntegrationRuntimeDataProxyProperties dataProxyProperties, IntegrationRuntimeEdition? edition, IList<CustomSetupBase> expressCustomSetupProperties, IList<DataFactoryPackageStore> packageStores, DataFactoryCredentialReference credential, IDictionary<string, DataFactoryElement<string>> additionalProperties)
         {
             CatalogInfo = catalogInfo;
             LicenseType = licenseType;
@@ -97,6 +98,6 @@ internal IntegrationRuntimeSsisProperties(IntegrationRuntimeSsisCatalogInfo cata
         /// </list>
         /// </para>
         /// </summary>
-        public IDictionary<string, BinaryData> AdditionalProperties { get; }
+        public IDictionary<string, DataFactoryElement<string>> AdditionalProperties { get; }
     }
 }
diff --git a/src/AzureDataFactory.TestingFramework/Generated/Models/IntegrationRuntimeStatus.cs b/src/AzureDataFactory.TestingFramework/Generated/Models/IntegrationRuntimeStatus.cs
index 30625d88..980306b3 100644
--- a/src/AzureDataFactory.TestingFramework/Generated/Models/IntegrationRuntimeStatus.cs
+++ b/src/AzureDataFactory.TestingFramework/Generated/Models/IntegrationRuntimeStatus.cs
@@ -6,6 +6,7 @@
 #nullable disable
 
 using Azure.Core;
+using Azure.Core.Expressions.DataFactory;
 
 namespace AzureDataFactory.TestingFramework.Models
 {
@@ -19,7 +20,7 @@ public partial class IntegrationRuntimeStatus
         /// <summary> Initializes a new instance of IntegrationRuntimeStatus. </summary>
         internal IntegrationRuntimeStatus()
         {
-            AdditionalProperties = new ChangeTrackingDictionary<string, BinaryData>();
+            AdditionalProperties = new ChangeTrackingDictionary<string, DataFactoryElement<string>>();
         }
 
         /// <summary> Initializes a new instance of IntegrationRuntimeStatus. </summary>
@@ -27,7 +28,7 @@ internal IntegrationRuntimeStatus()
         /// <param name="dataFactoryName"> The data factory name which the integration runtime belong to. </param>
         /// <param name="state"> The state of integration runtime. </param>
         /// <param name="additionalProperties"> Additional Properties. </param>
-        internal IntegrationRuntimeStatus(IntegrationRuntimeType runtimeType, string dataFactoryName, IntegrationRuntimeState? state, IReadOnlyDictionary<string, BinaryData> additionalProperties)
+        internal IntegrationRuntimeStatus(IntegrationRuntimeType runtimeType, string dataFactoryName, IntegrationRuntimeState? state, IReadOnlyDictionary<string, DataFactoryElement<string>> additionalProperties)
         {
             RuntimeType = runtimeType;
             DataFactoryName = dataFactoryName;
@@ -71,6 +72,6 @@ internal IntegrationRuntimeStatus(IntegrationRuntimeType runtimeType, string dat
         /// </list>
         /// </para>
         /// </summary>
-        public IReadOnlyDictionary<string, BinaryData> AdditionalProperties { get; }
+        public IReadOnlyDictionary<string, DataFactoryElement<string>> AdditionalProperties { get; }
     }
 }
diff --git a/src/AzureDataFactory.TestingFramework/Generated/Models/IntegrationRuntimeVnetProperties.Serialization.cs b/src/AzureDataFactory.TestingFramework/Generated/Models/IntegrationRuntimeVnetProperties.Serialization.cs
index 1efff85d..d9846da6 100644
--- a/src/AzureDataFactory.TestingFramework/Generated/Models/IntegrationRuntimeVnetProperties.Serialization.cs
+++ b/src/AzureDataFactory.TestingFramework/Generated/Models/IntegrationRuntimeVnetProperties.Serialization.cs
@@ -7,6 +7,7 @@
 
 using System.Text.Json;
 using Azure.Core;
+using Azure.Core.Expressions.DataFactory;
 
 namespace AzureDataFactory.TestingFramework.Models
 {
@@ -62,8 +63,8 @@ internal static IntegrationRuntimeVnetProperties DeserializeIntegrationRuntimeVn
             Optional<string> subnet = default;
             Optional<IList<string>> publicIPs = default;
             Optional<ResourceIdentifier> subnetId = default;
-            IDictionary<string, BinaryData> additionalProperties = default;
-            Dictionary<string, BinaryData> additionalPropertiesDictionary = new Dictionary<string, BinaryData>();
+            IDictionary<string, DataFactoryElement<string>> additionalProperties = default;
+            Dictionary<string, DataFactoryElement<string>> additionalPropertiesDictionary = new Dictionary<string, DataFactoryElement<string>>();
             foreach (var property in element.EnumerateObject())
             {
                 if (property.NameEquals("vNetId"u8))
@@ -103,7 +104,7 @@ internal static IntegrationRuntimeVnetProperties DeserializeIntegrationRuntimeVn
                     subnetId = new ResourceIdentifier(property.Value.GetString());
                     continue;
                 }
-                additionalPropertiesDictionary.Add(property.Name, BinaryData.FromString(property.Value.GetRawText()));
+                additionalPropertiesDictionary.Add(property.Name, JsonSerializer.Deserialize<DataFactoryElement<string>>(property.Value.GetRawText()));
             }
             additionalProperties = additionalPropertiesDictionary;
             return new IntegrationRuntimeVnetProperties(Optional.ToNullable(vnetId), subnet.Value, Optional.ToList(publicIPs), subnetId.Value, additionalProperties);
diff --git a/src/AzureDataFactory.TestingFramework/Generated/Models/IntegrationRuntimeVnetProperties.cs b/src/AzureDataFactory.TestingFramework/Generated/Models/IntegrationRuntimeVnetProperties.cs
index c3e39772..586daf9d 100644
--- a/src/AzureDataFactory.TestingFramework/Generated/Models/IntegrationRuntimeVnetProperties.cs
+++ b/src/AzureDataFactory.TestingFramework/Generated/Models/IntegrationRuntimeVnetProperties.cs
@@ -6,6 +6,7 @@
 #nullable disable
 
 using Azure.Core;
+using Azure.Core.Expressions.DataFactory;
 
 namespace AzureDataFactory.TestingFramework.Models
 {
@@ -16,7 +17,7 @@ public partial class IntegrationRuntimeVnetProperties
         public IntegrationRuntimeVnetProperties()
         {
             PublicIPs = new ChangeTrackingList<string>();
-            AdditionalProperties = new ChangeTrackingDictionary<string, BinaryData>();
+            AdditionalProperties = new ChangeTrackingDictionary<string, DataFactoryElement<string>>();
         }
 
         /// <summary> Initializes a new instance of IntegrationRuntimeVnetProperties. </summary>
@@ -25,7 +26,7 @@ public IntegrationRuntimeVnetProperties()
         /// <param name="publicIPs"> Resource IDs of the public IP addresses that this integration runtime will use. </param>
         /// <param name="subnetId"> The ID of subnet, to which this Azure-SSIS integration runtime will be joined. </param>
         /// <param name="additionalProperties"> Additional Properties. </param>
-        internal IntegrationRuntimeVnetProperties(Guid? vnetId, string subnet, IList<string> publicIPs, ResourceIdentifier subnetId, IDictionary<string, BinaryData> additionalProperties)
+        internal IntegrationRuntimeVnetProperties(Guid? vnetId, string subnet, IList<string> publicIPs, ResourceIdentifier subnetId, IDictionary<string, DataFactoryElement<string>> additionalProperties)
         {
             VnetId = vnetId;
             Subnet = subnet;
@@ -72,6 +73,6 @@ internal IntegrationRuntimeVnetProperties(Guid? vnetId, string subnet, IList<str
         /// </list>
         /// </para>
         /// </summary>
-        public IDictionary<string, BinaryData> AdditionalProperties { get; }
+        public IDictionary<string, DataFactoryElement<string>> AdditionalProperties { get; }
     }
 }
diff --git a/src/AzureDataFactory.TestingFramework/Generated/Models/JiraLinkedService.Serialization.cs b/src/AzureDataFactory.TestingFramework/Generated/Models/JiraLinkedService.Serialization.cs
index b4f27af4..23787e6c 100644
--- a/src/AzureDataFactory.TestingFramework/Generated/Models/JiraLinkedService.Serialization.cs
+++ b/src/AzureDataFactory.TestingFramework/Generated/Models/JiraLinkedService.Serialization.cs
@@ -126,8 +126,8 @@ internal static JiraLinkedService DeserializeJiraLinkedService(JsonElement eleme
             Optional<DataFactoryElement<bool>> useHostVerification = default;
             Optional<DataFactoryElement<bool>> usePeerVerification = default;
             Optional<string> encryptedCredential = default;
-            IDictionary<string, BinaryData> additionalProperties = default;
-            Dictionary<string, BinaryData> additionalPropertiesDictionary = new Dictionary<string, BinaryData>();
+            IDictionary<string, DataFactoryElement<string>> additionalProperties = default;
+            Dictionary<string, DataFactoryElement<string>> additionalPropertiesDictionary = new Dictionary<string, DataFactoryElement<string>>();
             foreach (var property in element.EnumerateObject())
             {
                 if (property.NameEquals("type"u8))
@@ -256,7 +256,7 @@ internal static JiraLinkedService DeserializeJiraLinkedService(JsonElement eleme
                     }
                     continue;
                 }
-                additionalPropertiesDictionary.Add(property.Name, BinaryData.FromString(property.Value.GetRawText()));
+                additionalPropertiesDictionary.Add(property.Name, JsonSerializer.Deserialize<DataFactoryElement<string>>(property.Value.GetRawText()));
             }
             additionalProperties = additionalPropertiesDictionary;
             return new JiraLinkedService(type, connectVia.Value, description.Value, Optional.ToDictionary(parameters), Optional.ToList(annotations), additionalProperties, host, port.Value, username, password, useEncryptedEndpoints.Value, useHostVerification.Value, usePeerVerification.Value, encryptedCredential.Value);
diff --git a/src/AzureDataFactory.TestingFramework/Generated/Models/JiraLinkedService.cs b/src/AzureDataFactory.TestingFramework/Generated/Models/JiraLinkedService.cs
index be02af4a..a0909e70 100644
--- a/src/AzureDataFactory.TestingFramework/Generated/Models/JiraLinkedService.cs
+++ b/src/AzureDataFactory.TestingFramework/Generated/Models/JiraLinkedService.cs
@@ -42,7 +42,7 @@ public JiraLinkedService(DataFactoryElement<string> host, DataFactoryElement<str
         /// <param name="useHostVerification"> Specifies whether to require the host name in the server's certificate to match the host name of the server when connecting over SSL. The default value is true. </param>
         /// <param name="usePeerVerification"> Specifies whether to verify the identity of the server when connecting over SSL. The default value is true. </param>
         /// <param name="encryptedCredential"> The encrypted credential used for authentication. Credentials are encrypted using the integration runtime credential manager. Type: string. </param>
-        internal JiraLinkedService(string linkedServiceType, IntegrationRuntimeReference connectVia, string description, IDictionary<string, EntityParameterSpecification> parameters, IList<BinaryData> annotations, IDictionary<string, BinaryData> additionalProperties, DataFactoryElement<string> host, DataFactoryElement<int> port, DataFactoryElement<string> username, DataFactorySecretBaseDefinition password, DataFactoryElement<bool> useEncryptedEndpoints, DataFactoryElement<bool> useHostVerification, DataFactoryElement<bool> usePeerVerification, string encryptedCredential) : base(linkedServiceType, connectVia, description, parameters, annotations, additionalProperties)
+        internal JiraLinkedService(string linkedServiceType, IntegrationRuntimeReference connectVia, string description, IDictionary<string, EntityParameterSpecification> parameters, IList<BinaryData> annotations, IDictionary<string, DataFactoryElement<string>> additionalProperties, DataFactoryElement<string> host, DataFactoryElement<int> port, DataFactoryElement<string> username, DataFactorySecretBaseDefinition password, DataFactoryElement<bool> useEncryptedEndpoints, DataFactoryElement<bool> useHostVerification, DataFactoryElement<bool> usePeerVerification, string encryptedCredential) : base(linkedServiceType, connectVia, description, parameters, annotations, additionalProperties)
         {
             Host = host;
             Port = port;
diff --git a/src/AzureDataFactory.TestingFramework/Generated/Models/JiraObjectDataset.Serialization.cs b/src/AzureDataFactory.TestingFramework/Generated/Models/JiraObjectDataset.Serialization.cs
index 7ec58a1c..228d34ac 100644
--- a/src/AzureDataFactory.TestingFramework/Generated/Models/JiraObjectDataset.Serialization.cs
+++ b/src/AzureDataFactory.TestingFramework/Generated/Models/JiraObjectDataset.Serialization.cs
@@ -104,8 +104,8 @@ internal static JiraObjectDataset DeserializeJiraObjectDataset(JsonElement eleme
             Optional<IList<BinaryData>> annotations = default;
             Optional<DatasetFolder> folder = default;
             Optional<DataFactoryElement<string>> tableName = default;
-            IDictionary<string, BinaryData> additionalProperties = default;
-            Dictionary<string, BinaryData> additionalPropertiesDictionary = new Dictionary<string, BinaryData>();
+            IDictionary<string, DataFactoryElement<string>> additionalProperties = default;
+            Dictionary<string, DataFactoryElement<string>> additionalPropertiesDictionary = new Dictionary<string, DataFactoryElement<string>>();
             foreach (var property in element.EnumerateObject())
             {
                 if (property.NameEquals("type"u8))
@@ -206,7 +206,7 @@ internal static JiraObjectDataset DeserializeJiraObjectDataset(JsonElement eleme
                     }
                     continue;
                 }
-                additionalPropertiesDictionary.Add(property.Name, BinaryData.FromString(property.Value.GetRawText()));
+                additionalPropertiesDictionary.Add(property.Name, JsonSerializer.Deserialize<DataFactoryElement<string>>(property.Value.GetRawText()));
             }
             additionalProperties = additionalPropertiesDictionary;
             return new JiraObjectDataset(type, description.Value, structure.Value, schema.Value, linkedServiceName, Optional.ToDictionary(parameters), Optional.ToList(annotations), folder.Value, additionalProperties, tableName.Value);
diff --git a/src/AzureDataFactory.TestingFramework/Generated/Models/JiraObjectDataset.cs b/src/AzureDataFactory.TestingFramework/Generated/Models/JiraObjectDataset.cs
index 20009806..94de01f6 100644
--- a/src/AzureDataFactory.TestingFramework/Generated/Models/JiraObjectDataset.cs
+++ b/src/AzureDataFactory.TestingFramework/Generated/Models/JiraObjectDataset.cs
@@ -34,7 +34,7 @@ public JiraObjectDataset(DataFactoryLinkedServiceReference linkedServiceName) :
         /// <param name="folder"> The folder that this Dataset is in. If not specified, Dataset will appear at the root level. </param>
         /// <param name="additionalProperties"> Additional Properties. </param>
         /// <param name="tableName"> The table name. Type: string (or Expression with resultType string). </param>
-        internal JiraObjectDataset(string datasetType, string description, DataFactoryElement<IList<DatasetDataElement>> structure, DataFactoryElement<IList<DatasetSchemaDataElement>> schema, DataFactoryLinkedServiceReference linkedServiceName, IDictionary<string, EntityParameterSpecification> parameters, IList<BinaryData> annotations, DatasetFolder folder, IDictionary<string, BinaryData> additionalProperties, DataFactoryElement<string> tableName) : base(datasetType, description, structure, schema, linkedServiceName, parameters, annotations, folder, additionalProperties)
+        internal JiraObjectDataset(string datasetType, string description, DataFactoryElement<IList<DatasetDataElement>> structure, DataFactoryElement<IList<DatasetSchemaDataElement>> schema, DataFactoryLinkedServiceReference linkedServiceName, IDictionary<string, EntityParameterSpecification> parameters, IList<BinaryData> annotations, DatasetFolder folder, IDictionary<string, DataFactoryElement<string>> additionalProperties, DataFactoryElement<string> tableName) : base(datasetType, description, structure, schema, linkedServiceName, parameters, annotations, folder, additionalProperties)
         {
             TableName = tableName;
             DatasetType = datasetType ?? "JiraObject";
diff --git a/src/AzureDataFactory.TestingFramework/Generated/Models/JiraSource.Serialization.cs b/src/AzureDataFactory.TestingFramework/Generated/Models/JiraSource.Serialization.cs
index 4784de4c..23e7e3f4 100644
--- a/src/AzureDataFactory.TestingFramework/Generated/Models/JiraSource.Serialization.cs
+++ b/src/AzureDataFactory.TestingFramework/Generated/Models/JiraSource.Serialization.cs
@@ -83,8 +83,8 @@ internal static JiraSource DeserializeJiraSource(JsonElement element)
             Optional<DataFactoryElement<string>> sourceRetryWait = default;
             Optional<DataFactoryElement<int>> maxConcurrentConnections = default;
             Optional<DataFactoryElement<bool>> disableMetricsCollection = default;
-            IDictionary<string, BinaryData> additionalProperties = default;
-            Dictionary<string, BinaryData> additionalPropertiesDictionary = new Dictionary<string, BinaryData>();
+            IDictionary<string, DataFactoryElement<string>> additionalProperties = default;
+            Dictionary<string, DataFactoryElement<string>> additionalPropertiesDictionary = new Dictionary<string, DataFactoryElement<string>>();
             foreach (var property in element.EnumerateObject())
             {
                 if (property.NameEquals("query"u8))
@@ -155,7 +155,7 @@ internal static JiraSource DeserializeJiraSource(JsonElement element)
                     disableMetricsCollection = JsonSerializer.Deserialize<DataFactoryElement<bool>>(property.Value.GetRawText());
                     continue;
                 }
-                additionalPropertiesDictionary.Add(property.Name, BinaryData.FromString(property.Value.GetRawText()));
+                additionalPropertiesDictionary.Add(property.Name, JsonSerializer.Deserialize<DataFactoryElement<string>>(property.Value.GetRawText()));
             }
             additionalProperties = additionalPropertiesDictionary;
             return new JiraSource(type, sourceRetryCount.Value, sourceRetryWait.Value, maxConcurrentConnections.Value, disableMetricsCollection.Value, additionalProperties, queryTimeout.Value, additionalColumns.Value, query.Value);
diff --git a/src/AzureDataFactory.TestingFramework/Generated/Models/JiraSource.cs b/src/AzureDataFactory.TestingFramework/Generated/Models/JiraSource.cs
index 197757db..7e4cdecb 100644
--- a/src/AzureDataFactory.TestingFramework/Generated/Models/JiraSource.cs
+++ b/src/AzureDataFactory.TestingFramework/Generated/Models/JiraSource.cs
@@ -28,7 +28,7 @@ public JiraSource()
         /// <param name="queryTimeout"> Query timeout. Type: string (or Expression with resultType string), pattern: ((\d+)\.)?(\d\d):(60|([0-5][0-9])):(60|([0-5][0-9])). </param>
         /// <param name="additionalColumns"> Specifies the additional columns to be added to source data. Type: array of objects(AdditionalColumns) (or Expression with resultType array of objects). </param>
         /// <param name="query"> A query to retrieve data from source. Type: string (or Expression with resultType string). </param>
-        internal JiraSource(string copySourceType, DataFactoryElement<int> sourceRetryCount, DataFactoryElement<string> sourceRetryWait, DataFactoryElement<int> maxConcurrentConnections, DataFactoryElement<bool> disableMetricsCollection, IDictionary<string, BinaryData> additionalProperties, DataFactoryElement<string> queryTimeout, BinaryData additionalColumns, DataFactoryElement<string> query) : base(copySourceType, sourceRetryCount, sourceRetryWait, maxConcurrentConnections, disableMetricsCollection, additionalProperties, queryTimeout, additionalColumns)
+        internal JiraSource(string copySourceType, DataFactoryElement<int> sourceRetryCount, DataFactoryElement<string> sourceRetryWait, DataFactoryElement<int> maxConcurrentConnections, DataFactoryElement<bool> disableMetricsCollection, IDictionary<string, DataFactoryElement<string>> additionalProperties, DataFactoryElement<string> queryTimeout, BinaryData additionalColumns, DataFactoryElement<string> query) : base(copySourceType, sourceRetryCount, sourceRetryWait, maxConcurrentConnections, disableMetricsCollection, additionalProperties, queryTimeout, additionalColumns)
         {
             Query = query;
             CopySourceType = copySourceType ?? "JiraSource";
diff --git a/src/AzureDataFactory.TestingFramework/Generated/Models/JsonDataset.Serialization.cs b/src/AzureDataFactory.TestingFramework/Generated/Models/JsonDataset.Serialization.cs
index 18ce9c3d..f0a8a222 100644
--- a/src/AzureDataFactory.TestingFramework/Generated/Models/JsonDataset.Serialization.cs
+++ b/src/AzureDataFactory.TestingFramework/Generated/Models/JsonDataset.Serialization.cs
@@ -116,8 +116,8 @@ internal static JsonDataset DeserializeJsonDataset(JsonElement element)
             Optional<DatasetLocation> location = default;
             Optional<DataFactoryElement<string>> encodingName = default;
             Optional<DatasetCompression> compression = default;
-            IDictionary<string, BinaryData> additionalProperties = default;
-            Dictionary<string, BinaryData> additionalPropertiesDictionary = new Dictionary<string, BinaryData>();
+            IDictionary<string, DataFactoryElement<string>> additionalProperties = default;
+            Dictionary<string, DataFactoryElement<string>> additionalPropertiesDictionary = new Dictionary<string, DataFactoryElement<string>>();
             foreach (var property in element.EnumerateObject())
             {
                 if (property.NameEquals("type"u8))
@@ -236,7 +236,7 @@ internal static JsonDataset DeserializeJsonDataset(JsonElement element)
                     }
                     continue;
                 }
-                additionalPropertiesDictionary.Add(property.Name, BinaryData.FromString(property.Value.GetRawText()));
+                additionalPropertiesDictionary.Add(property.Name, JsonSerializer.Deserialize<DataFactoryElement<string>>(property.Value.GetRawText()));
             }
             additionalProperties = additionalPropertiesDictionary;
             return new JsonDataset(type, description.Value, structure.Value, schema.Value, linkedServiceName, Optional.ToDictionary(parameters), Optional.ToList(annotations), folder.Value, additionalProperties, location.Value, encodingName.Value, compression.Value);
diff --git a/src/AzureDataFactory.TestingFramework/Generated/Models/JsonDataset.cs b/src/AzureDataFactory.TestingFramework/Generated/Models/JsonDataset.cs
index 00bb4eff..402874a5 100644
--- a/src/AzureDataFactory.TestingFramework/Generated/Models/JsonDataset.cs
+++ b/src/AzureDataFactory.TestingFramework/Generated/Models/JsonDataset.cs
@@ -40,7 +40,7 @@ public JsonDataset(DataFactoryLinkedServiceReference linkedServiceName) : base(l
         /// </param>
         /// <param name="encodingName"> The code page name of the preferred encoding. If not specified, the default value is UTF-8, unless BOM denotes another Unicode encoding. Refer to the name column of the table in the following link to set supported values: https://msdn.microsoft.com/library/system.text.encoding.aspx. Type: string (or Expression with resultType string). </param>
         /// <param name="compression"> The data compression method used for the json dataset. </param>
-        internal JsonDataset(string datasetType, string description, DataFactoryElement<IList<DatasetDataElement>> structure, DataFactoryElement<IList<DatasetSchemaDataElement>> schema, DataFactoryLinkedServiceReference linkedServiceName, IDictionary<string, EntityParameterSpecification> parameters, IList<BinaryData> annotations, DatasetFolder folder, IDictionary<string, BinaryData> additionalProperties, DatasetLocation dataLocation, DataFactoryElement<string> encodingName, DatasetCompression compression) : base(datasetType, description, structure, schema, linkedServiceName, parameters, annotations, folder, additionalProperties)
+        internal JsonDataset(string datasetType, string description, DataFactoryElement<IList<DatasetDataElement>> structure, DataFactoryElement<IList<DatasetSchemaDataElement>> schema, DataFactoryLinkedServiceReference linkedServiceName, IDictionary<string, EntityParameterSpecification> parameters, IList<BinaryData> annotations, DatasetFolder folder, IDictionary<string, DataFactoryElement<string>> additionalProperties, DatasetLocation dataLocation, DataFactoryElement<string> encodingName, DatasetCompression compression) : base(datasetType, description, structure, schema, linkedServiceName, parameters, annotations, folder, additionalProperties)
         {
             DataLocation = dataLocation;
             EncodingName = encodingName;
diff --git a/src/AzureDataFactory.TestingFramework/Generated/Models/JsonReadSettings.Serialization.cs b/src/AzureDataFactory.TestingFramework/Generated/Models/JsonReadSettings.Serialization.cs
index bb2b2caa..51c9756c 100644
--- a/src/AzureDataFactory.TestingFramework/Generated/Models/JsonReadSettings.Serialization.cs
+++ b/src/AzureDataFactory.TestingFramework/Generated/Models/JsonReadSettings.Serialization.cs
@@ -7,6 +7,7 @@
 
 using System.Text.Json;
 using Azure.Core;
+using Azure.Core.Expressions.DataFactory;
 
 namespace AzureDataFactory.TestingFramework.Models
 {
@@ -42,8 +43,8 @@ internal static JsonReadSettings DeserializeJsonReadSettings(JsonElement element
             }
             Optional<CompressionReadSettings> compressionProperties = default;
             string type = default;
-            IDictionary<string, BinaryData> additionalProperties = default;
-            Dictionary<string, BinaryData> additionalPropertiesDictionary = new Dictionary<string, BinaryData>();
+            IDictionary<string, DataFactoryElement<string>> additionalProperties = default;
+            Dictionary<string, DataFactoryElement<string>> additionalPropertiesDictionary = new Dictionary<string, DataFactoryElement<string>>();
             foreach (var property in element.EnumerateObject())
             {
                 if (property.NameEquals("compressionProperties"u8))
@@ -60,7 +61,7 @@ internal static JsonReadSettings DeserializeJsonReadSettings(JsonElement element
                     type = property.Value.GetString();
                     continue;
                 }
-                additionalPropertiesDictionary.Add(property.Name, BinaryData.FromString(property.Value.GetRawText()));
+                additionalPropertiesDictionary.Add(property.Name, JsonSerializer.Deserialize<DataFactoryElement<string>>(property.Value.GetRawText()));
             }
             additionalProperties = additionalPropertiesDictionary;
             return new JsonReadSettings(type, additionalProperties, compressionProperties.Value);
diff --git a/src/AzureDataFactory.TestingFramework/Generated/Models/JsonReadSettings.cs b/src/AzureDataFactory.TestingFramework/Generated/Models/JsonReadSettings.cs
index 7e91010e..7593609e 100644
--- a/src/AzureDataFactory.TestingFramework/Generated/Models/JsonReadSettings.cs
+++ b/src/AzureDataFactory.TestingFramework/Generated/Models/JsonReadSettings.cs
@@ -5,6 +5,8 @@
 
 #nullable disable
 
+using Azure.Core.Expressions.DataFactory;
+
 namespace AzureDataFactory.TestingFramework.Models
 {
     /// <summary> Json read settings. </summary>
@@ -24,7 +26,7 @@ public JsonReadSettings()
         /// Please note <see cref="CompressionReadSettings"/> is the base class. According to the scenario, a derived class of the base class might need to be assigned here, or this property needs to be casted to one of the possible derived classes.
         /// The available derived classes include <see cref="TarGzipReadSettings"/>, <see cref="TarReadSettings"/> and <see cref="ZipDeflateReadSettings"/>.
         /// </param>
-        internal JsonReadSettings(string formatReadSettingsType, IDictionary<string, BinaryData> additionalProperties, CompressionReadSettings compressionProperties) : base(formatReadSettingsType, additionalProperties)
+        internal JsonReadSettings(string formatReadSettingsType, IDictionary<string, DataFactoryElement<string>> additionalProperties, CompressionReadSettings compressionProperties) : base(formatReadSettingsType, additionalProperties)
         {
             CompressionProperties = compressionProperties;
             FormatReadSettingsType = formatReadSettingsType ?? "JsonReadSettings";
diff --git a/src/AzureDataFactory.TestingFramework/Generated/Models/JsonSink.Serialization.cs b/src/AzureDataFactory.TestingFramework/Generated/Models/JsonSink.Serialization.cs
index b2bffc85..b666b3fc 100644
--- a/src/AzureDataFactory.TestingFramework/Generated/Models/JsonSink.Serialization.cs
+++ b/src/AzureDataFactory.TestingFramework/Generated/Models/JsonSink.Serialization.cs
@@ -85,8 +85,8 @@ internal static JsonSink DeserializeJsonSink(JsonElement element)
             Optional<DataFactoryElement<string>> sinkRetryWait = default;
             Optional<DataFactoryElement<int>> maxConcurrentConnections = default;
             Optional<DataFactoryElement<bool>> disableMetricsCollection = default;
-            IDictionary<string, BinaryData> additionalProperties = default;
-            Dictionary<string, BinaryData> additionalPropertiesDictionary = new Dictionary<string, BinaryData>();
+            IDictionary<string, DataFactoryElement<string>> additionalProperties = default;
+            Dictionary<string, DataFactoryElement<string>> additionalPropertiesDictionary = new Dictionary<string, DataFactoryElement<string>>();
             foreach (var property in element.EnumerateObject())
             {
                 if (property.NameEquals("storeSettings"u8))
@@ -166,7 +166,7 @@ internal static JsonSink DeserializeJsonSink(JsonElement element)
                     disableMetricsCollection = JsonSerializer.Deserialize<DataFactoryElement<bool>>(property.Value.GetRawText());
                     continue;
                 }
-                additionalPropertiesDictionary.Add(property.Name, BinaryData.FromString(property.Value.GetRawText()));
+                additionalPropertiesDictionary.Add(property.Name, JsonSerializer.Deserialize<DataFactoryElement<string>>(property.Value.GetRawText()));
             }
             additionalProperties = additionalPropertiesDictionary;
             return new JsonSink(type, writeBatchSize.Value, writeBatchTimeout.Value, sinkRetryCount.Value, sinkRetryWait.Value, maxConcurrentConnections.Value, disableMetricsCollection.Value, additionalProperties, storeSettings.Value, formatSettings.Value);
diff --git a/src/AzureDataFactory.TestingFramework/Generated/Models/JsonSink.cs b/src/AzureDataFactory.TestingFramework/Generated/Models/JsonSink.cs
index 5b059571..8f488d51 100644
--- a/src/AzureDataFactory.TestingFramework/Generated/Models/JsonSink.cs
+++ b/src/AzureDataFactory.TestingFramework/Generated/Models/JsonSink.cs
@@ -33,7 +33,7 @@ public JsonSink()
         /// The available derived classes include <see cref="AzureBlobFSWriteSettings"/>, <see cref="AzureBlobStorageWriteSettings"/>, <see cref="AzureDataLakeStoreWriteSettings"/>, <see cref="AzureFileStorageWriteSettings"/>, <see cref="FileServerWriteSettings"/> and <see cref="SftpWriteSettings"/>.
         /// </param>
         /// <param name="formatSettings"> Json format settings. </param>
-        internal JsonSink(string copySinkType, DataFactoryElement<int> writeBatchSize, DataFactoryElement<string> writeBatchTimeout, DataFactoryElement<int> sinkRetryCount, DataFactoryElement<string> sinkRetryWait, DataFactoryElement<int> maxConcurrentConnections, DataFactoryElement<bool> disableMetricsCollection, IDictionary<string, BinaryData> additionalProperties, StoreWriteSettings storeSettings, JsonWriteSettings formatSettings) : base(copySinkType, writeBatchSize, writeBatchTimeout, sinkRetryCount, sinkRetryWait, maxConcurrentConnections, disableMetricsCollection, additionalProperties)
+        internal JsonSink(string copySinkType, DataFactoryElement<int> writeBatchSize, DataFactoryElement<string> writeBatchTimeout, DataFactoryElement<int> sinkRetryCount, DataFactoryElement<string> sinkRetryWait, DataFactoryElement<int> maxConcurrentConnections, DataFactoryElement<bool> disableMetricsCollection, IDictionary<string, DataFactoryElement<string>> additionalProperties, StoreWriteSettings storeSettings, JsonWriteSettings formatSettings) : base(copySinkType, writeBatchSize, writeBatchTimeout, sinkRetryCount, sinkRetryWait, maxConcurrentConnections, disableMetricsCollection, additionalProperties)
         {
             StoreSettings = storeSettings;
             FormatSettings = formatSettings;
diff --git a/src/AzureDataFactory.TestingFramework/Generated/Models/JsonSource.Serialization.cs b/src/AzureDataFactory.TestingFramework/Generated/Models/JsonSource.Serialization.cs
index bec16489..e958a24e 100644
--- a/src/AzureDataFactory.TestingFramework/Generated/Models/JsonSource.Serialization.cs
+++ b/src/AzureDataFactory.TestingFramework/Generated/Models/JsonSource.Serialization.cs
@@ -83,8 +83,8 @@ internal static JsonSource DeserializeJsonSource(JsonElement element)
             Optional<DataFactoryElement<string>> sourceRetryWait = default;
             Optional<DataFactoryElement<int>> maxConcurrentConnections = default;
             Optional<DataFactoryElement<bool>> disableMetricsCollection = default;
-            IDictionary<string, BinaryData> additionalProperties = default;
-            Dictionary<string, BinaryData> additionalPropertiesDictionary = new Dictionary<string, BinaryData>();
+            IDictionary<string, DataFactoryElement<string>> additionalProperties = default;
+            Dictionary<string, DataFactoryElement<string>> additionalPropertiesDictionary = new Dictionary<string, DataFactoryElement<string>>();
             foreach (var property in element.EnumerateObject())
             {
                 if (property.NameEquals("storeSettings"u8))
@@ -155,7 +155,7 @@ internal static JsonSource DeserializeJsonSource(JsonElement element)
                     disableMetricsCollection = JsonSerializer.Deserialize<DataFactoryElement<bool>>(property.Value.GetRawText());
                     continue;
                 }
-                additionalPropertiesDictionary.Add(property.Name, BinaryData.FromString(property.Value.GetRawText()));
+                additionalPropertiesDictionary.Add(property.Name, JsonSerializer.Deserialize<DataFactoryElement<string>>(property.Value.GetRawText()));
             }
             additionalProperties = additionalPropertiesDictionary;
             return new JsonSource(type, sourceRetryCount.Value, sourceRetryWait.Value, maxConcurrentConnections.Value, disableMetricsCollection.Value, additionalProperties, storeSettings.Value, formatSettings.Value, additionalColumns.Value);
diff --git a/src/AzureDataFactory.TestingFramework/Generated/Models/JsonSource.cs b/src/AzureDataFactory.TestingFramework/Generated/Models/JsonSource.cs
index 74fbfaf1..49a6b283 100644
--- a/src/AzureDataFactory.TestingFramework/Generated/Models/JsonSource.cs
+++ b/src/AzureDataFactory.TestingFramework/Generated/Models/JsonSource.cs
@@ -32,7 +32,7 @@ public JsonSource()
         /// </param>
         /// <param name="formatSettings"> Json format settings. </param>
         /// <param name="additionalColumns"> Specifies the additional columns to be added to source data. Type: array of objects(AdditionalColumns) (or Expression with resultType array of objects). </param>
-        internal JsonSource(string copySourceType, DataFactoryElement<int> sourceRetryCount, DataFactoryElement<string> sourceRetryWait, DataFactoryElement<int> maxConcurrentConnections, DataFactoryElement<bool> disableMetricsCollection, IDictionary<string, BinaryData> additionalProperties, StoreReadSettings storeSettings, JsonReadSettings formatSettings, BinaryData additionalColumns) : base(copySourceType, sourceRetryCount, sourceRetryWait, maxConcurrentConnections, disableMetricsCollection, additionalProperties)
+        internal JsonSource(string copySourceType, DataFactoryElement<int> sourceRetryCount, DataFactoryElement<string> sourceRetryWait, DataFactoryElement<int> maxConcurrentConnections, DataFactoryElement<bool> disableMetricsCollection, IDictionary<string, DataFactoryElement<string>> additionalProperties, StoreReadSettings storeSettings, JsonReadSettings formatSettings, BinaryData additionalColumns) : base(copySourceType, sourceRetryCount, sourceRetryWait, maxConcurrentConnections, disableMetricsCollection, additionalProperties)
         {
             StoreSettings = storeSettings;
             FormatSettings = formatSettings;
diff --git a/src/AzureDataFactory.TestingFramework/Generated/Models/JsonWriteSettings.Serialization.cs b/src/AzureDataFactory.TestingFramework/Generated/Models/JsonWriteSettings.Serialization.cs
index a5d1609a..f1cd00ab 100644
--- a/src/AzureDataFactory.TestingFramework/Generated/Models/JsonWriteSettings.Serialization.cs
+++ b/src/AzureDataFactory.TestingFramework/Generated/Models/JsonWriteSettings.Serialization.cs
@@ -7,6 +7,7 @@
 
 using System.Text.Json;
 using Azure.Core;
+using Azure.Core.Expressions.DataFactory;
 
 namespace AzureDataFactory.TestingFramework.Models
 {
@@ -46,8 +47,8 @@ internal static JsonWriteSettings DeserializeJsonWriteSettings(JsonElement eleme
             }
             Optional<BinaryData> filePattern = default;
             string type = default;
-            IDictionary<string, BinaryData> additionalProperties = default;
-            Dictionary<string, BinaryData> additionalPropertiesDictionary = new Dictionary<string, BinaryData>();
+            IDictionary<string, DataFactoryElement<string>> additionalProperties = default;
+            Dictionary<string, DataFactoryElement<string>> additionalPropertiesDictionary = new Dictionary<string, DataFactoryElement<string>>();
             foreach (var property in element.EnumerateObject())
             {
                 if (property.NameEquals("filePattern"u8))
@@ -64,7 +65,7 @@ internal static JsonWriteSettings DeserializeJsonWriteSettings(JsonElement eleme
                     type = property.Value.GetString();
                     continue;
                 }
-                additionalPropertiesDictionary.Add(property.Name, BinaryData.FromString(property.Value.GetRawText()));
+                additionalPropertiesDictionary.Add(property.Name, JsonSerializer.Deserialize<DataFactoryElement<string>>(property.Value.GetRawText()));
             }
             additionalProperties = additionalPropertiesDictionary;
             return new JsonWriteSettings(type, additionalProperties, filePattern.Value);
diff --git a/src/AzureDataFactory.TestingFramework/Generated/Models/JsonWriteSettings.cs b/src/AzureDataFactory.TestingFramework/Generated/Models/JsonWriteSettings.cs
index e3751c1f..2c93d306 100644
--- a/src/AzureDataFactory.TestingFramework/Generated/Models/JsonWriteSettings.cs
+++ b/src/AzureDataFactory.TestingFramework/Generated/Models/JsonWriteSettings.cs
@@ -5,6 +5,8 @@
 
 #nullable disable
 
+using Azure.Core.Expressions.DataFactory;
+
 namespace AzureDataFactory.TestingFramework.Models
 {
     /// <summary> Json write settings. </summary>
@@ -20,7 +22,7 @@ public JsonWriteSettings()
         /// <param name="formatWriteSettingsType"> The write setting type. </param>
         /// <param name="additionalProperties"> Additional Properties. </param>
         /// <param name="filePattern"> File pattern of JSON. This setting controls the way a collection of JSON objects will be treated. The default value is 'setOfObjects'. It is case-sensitive. </param>
-        internal JsonWriteSettings(string formatWriteSettingsType, IDictionary<string, BinaryData> additionalProperties, BinaryData filePattern) : base(formatWriteSettingsType, additionalProperties)
+        internal JsonWriteSettings(string formatWriteSettingsType, IDictionary<string, DataFactoryElement<string>> additionalProperties, BinaryData filePattern) : base(formatWriteSettingsType, additionalProperties)
         {
             FilePattern = filePattern;
             FormatWriteSettingsType = formatWriteSettingsType ?? "JsonWriteSettings";
diff --git a/src/AzureDataFactory.TestingFramework/Generated/Models/LogStorageSettings.Serialization.cs b/src/AzureDataFactory.TestingFramework/Generated/Models/LogStorageSettings.Serialization.cs
index f139787a..e6bfec52 100644
--- a/src/AzureDataFactory.TestingFramework/Generated/Models/LogStorageSettings.Serialization.cs
+++ b/src/AzureDataFactory.TestingFramework/Generated/Models/LogStorageSettings.Serialization.cs
@@ -54,8 +54,8 @@ internal static LogStorageSettings DeserializeLogStorageSettings(JsonElement ele
             Optional<DataFactoryElement<string>> path = default;
             Optional<DataFactoryElement<string>> logLevel = default;
             Optional<DataFactoryElement<bool>> enableReliableLogging = default;
-            IDictionary<string, BinaryData> additionalProperties = default;
-            Dictionary<string, BinaryData> additionalPropertiesDictionary = new Dictionary<string, BinaryData>();
+            IDictionary<string, DataFactoryElement<string>> additionalProperties = default;
+            Dictionary<string, DataFactoryElement<string>> additionalPropertiesDictionary = new Dictionary<string, DataFactoryElement<string>>();
             foreach (var property in element.EnumerateObject())
             {
                 if (property.NameEquals("linkedServiceName"u8))
@@ -90,7 +90,7 @@ internal static LogStorageSettings DeserializeLogStorageSettings(JsonElement ele
                     enableReliableLogging = JsonSerializer.Deserialize<DataFactoryElement<bool>>(property.Value.GetRawText());
                     continue;
                 }
-                additionalPropertiesDictionary.Add(property.Name, BinaryData.FromString(property.Value.GetRawText()));
+                additionalPropertiesDictionary.Add(property.Name, JsonSerializer.Deserialize<DataFactoryElement<string>>(property.Value.GetRawText()));
             }
             additionalProperties = additionalPropertiesDictionary;
             return new LogStorageSettings(linkedServiceName, path.Value, logLevel.Value, enableReliableLogging.Value, additionalProperties);
diff --git a/src/AzureDataFactory.TestingFramework/Generated/Models/LogStorageSettings.cs b/src/AzureDataFactory.TestingFramework/Generated/Models/LogStorageSettings.cs
index 52dc9276..e0c49aba 100644
--- a/src/AzureDataFactory.TestingFramework/Generated/Models/LogStorageSettings.cs
+++ b/src/AzureDataFactory.TestingFramework/Generated/Models/LogStorageSettings.cs
@@ -21,7 +21,7 @@ public LogStorageSettings(DataFactoryLinkedServiceReference linkedServiceName)
             Argument.AssertNotNull(linkedServiceName, nameof(linkedServiceName));
 
             LinkedServiceName = linkedServiceName;
-            AdditionalProperties = new ChangeTrackingDictionary<string, BinaryData>();
+            AdditionalProperties = new ChangeTrackingDictionary<string, DataFactoryElement<string>>();
         }
 
         /// <summary> Initializes a new instance of LogStorageSettings. </summary>
@@ -30,7 +30,7 @@ public LogStorageSettings(DataFactoryLinkedServiceReference linkedServiceName)
         /// <param name="logLevel"> Gets or sets the log level, support: Info, Warning. Type: string (or Expression with resultType string). </param>
         /// <param name="enableReliableLogging"> Specifies whether to enable reliable logging. Type: boolean (or Expression with resultType boolean). </param>
         /// <param name="additionalProperties"> Additional Properties. </param>
-        internal LogStorageSettings(DataFactoryLinkedServiceReference linkedServiceName, DataFactoryElement<string> path, DataFactoryElement<string> logLevel, DataFactoryElement<bool> enableReliableLogging, IDictionary<string, BinaryData> additionalProperties)
+        internal LogStorageSettings(DataFactoryLinkedServiceReference linkedServiceName, DataFactoryElement<string> path, DataFactoryElement<string> logLevel, DataFactoryElement<bool> enableReliableLogging, IDictionary<string, DataFactoryElement<string>> additionalProperties)
         {
             LinkedServiceName = linkedServiceName;
             Path = path;
@@ -77,6 +77,6 @@ internal LogStorageSettings(DataFactoryLinkedServiceReference linkedServiceName,
         /// </list>
         /// </para>
         /// </summary>
-        public IDictionary<string, BinaryData> AdditionalProperties { get; }
+        public IDictionary<string, DataFactoryElement<string>> AdditionalProperties { get; }
     }
 }
diff --git a/src/AzureDataFactory.TestingFramework/Generated/Models/LookupActivity.Serialization.cs b/src/AzureDataFactory.TestingFramework/Generated/Models/LookupActivity.Serialization.cs
index b49f59b3..d46dbfe0 100644
--- a/src/AzureDataFactory.TestingFramework/Generated/Models/LookupActivity.Serialization.cs
+++ b/src/AzureDataFactory.TestingFramework/Generated/Models/LookupActivity.Serialization.cs
@@ -107,8 +107,8 @@ internal static LookupActivity DeserializeLookupActivity(JsonElement element)
             CopyActivitySource source = default;
             DatasetReference dataset = default;
             Optional<DataFactoryElement<bool>> firstRowOnly = default;
-            IDictionary<string, BinaryData> additionalProperties = default;
-            Dictionary<string, BinaryData> additionalPropertiesDictionary = new Dictionary<string, BinaryData>();
+            IDictionary<string, DataFactoryElement<string>> additionalProperties = default;
+            Dictionary<string, DataFactoryElement<string>> additionalPropertiesDictionary = new Dictionary<string, DataFactoryElement<string>>();
             foreach (var property in element.EnumerateObject())
             {
                 if (property.NameEquals("linkedServiceName"u8))
@@ -221,7 +221,7 @@ internal static LookupActivity DeserializeLookupActivity(JsonElement element)
                     }
                     continue;
                 }
-                additionalPropertiesDictionary.Add(property.Name, BinaryData.FromString(property.Value.GetRawText()));
+                additionalPropertiesDictionary.Add(property.Name, JsonSerializer.Deserialize<DataFactoryElement<string>>(property.Value.GetRawText()));
             }
             additionalProperties = additionalPropertiesDictionary;
             return new LookupActivity(name, type, description.Value, Optional.ToNullable(state), Optional.ToNullable(onInactiveMarkAs), Optional.ToList(dependsOn), Optional.ToList(userProperties), additionalProperties, linkedServiceName, policy.Value, source, dataset, firstRowOnly.Value);
diff --git a/src/AzureDataFactory.TestingFramework/Generated/Models/LookupActivity.cs b/src/AzureDataFactory.TestingFramework/Generated/Models/LookupActivity.cs
index 00597ac0..1fc40c02 100644
--- a/src/AzureDataFactory.TestingFramework/Generated/Models/LookupActivity.cs
+++ b/src/AzureDataFactory.TestingFramework/Generated/Models/LookupActivity.cs
@@ -51,7 +51,7 @@ public LookupActivity(string name, CopyActivitySource source, DatasetReference d
         /// </param>
         /// <param name="dataset"> Lookup activity dataset reference. </param>
         /// <param name="firstRowOnly"> Whether to return first row or all rows. Default value is true. Type: boolean (or Expression with resultType boolean). </param>
-        internal LookupActivity(string name, string activityType, string description, PipelineActivityState? state, ActivityOnInactiveMarkAs? onInactiveMarkAs, IList<PipelineActivityDependency> dependsOn, IList<PipelineActivityUserProperty> userProperties, IDictionary<string, BinaryData> additionalProperties, DataFactoryLinkedServiceReference linkedServiceName, PipelineActivityPolicy policy, CopyActivitySource source, DatasetReference dataset, DataFactoryElement<bool> firstRowOnly) : base(name, activityType, description, state, onInactiveMarkAs, dependsOn, userProperties, additionalProperties, linkedServiceName, policy)
+        internal LookupActivity(string name, string activityType, string description, PipelineActivityState? state, ActivityOnInactiveMarkAs? onInactiveMarkAs, IList<PipelineActivityDependency> dependsOn, IList<PipelineActivityUserProperty> userProperties, IDictionary<string, DataFactoryElement<string>> additionalProperties, DataFactoryLinkedServiceReference linkedServiceName, PipelineActivityPolicy policy, CopyActivitySource source, DatasetReference dataset, DataFactoryElement<bool> firstRowOnly) : base(name, activityType, description, state, onInactiveMarkAs, dependsOn, userProperties, additionalProperties, linkedServiceName, policy)
         {
             Source = source;
             Dataset = dataset;
diff --git a/src/AzureDataFactory.TestingFramework/Generated/Models/MagentoLinkedService.Serialization.cs b/src/AzureDataFactory.TestingFramework/Generated/Models/MagentoLinkedService.Serialization.cs
index dc394f66..e700cc2b 100644
--- a/src/AzureDataFactory.TestingFramework/Generated/Models/MagentoLinkedService.Serialization.cs
+++ b/src/AzureDataFactory.TestingFramework/Generated/Models/MagentoLinkedService.Serialization.cs
@@ -117,8 +117,8 @@ internal static MagentoLinkedService DeserializeMagentoLinkedService(JsonElement
             Optional<DataFactoryElement<bool>> useHostVerification = default;
             Optional<DataFactoryElement<bool>> usePeerVerification = default;
             Optional<string> encryptedCredential = default;
-            IDictionary<string, BinaryData> additionalProperties = default;
-            Dictionary<string, BinaryData> additionalPropertiesDictionary = new Dictionary<string, BinaryData>();
+            IDictionary<string, DataFactoryElement<string>> additionalProperties = default;
+            Dictionary<string, DataFactoryElement<string>> additionalPropertiesDictionary = new Dictionary<string, DataFactoryElement<string>>();
             foreach (var property in element.EnumerateObject())
             {
                 if (property.NameEquals("type"u8))
@@ -233,7 +233,7 @@ internal static MagentoLinkedService DeserializeMagentoLinkedService(JsonElement
                     }
                     continue;
                 }
-                additionalPropertiesDictionary.Add(property.Name, BinaryData.FromString(property.Value.GetRawText()));
+                additionalPropertiesDictionary.Add(property.Name, JsonSerializer.Deserialize<DataFactoryElement<string>>(property.Value.GetRawText()));
             }
             additionalProperties = additionalPropertiesDictionary;
             return new MagentoLinkedService(type, connectVia.Value, description.Value, Optional.ToDictionary(parameters), Optional.ToList(annotations), additionalProperties, host, accessToken, useEncryptedEndpoints.Value, useHostVerification.Value, usePeerVerification.Value, encryptedCredential.Value);
diff --git a/src/AzureDataFactory.TestingFramework/Generated/Models/MagentoLinkedService.cs b/src/AzureDataFactory.TestingFramework/Generated/Models/MagentoLinkedService.cs
index 70594c67..de302525 100644
--- a/src/AzureDataFactory.TestingFramework/Generated/Models/MagentoLinkedService.cs
+++ b/src/AzureDataFactory.TestingFramework/Generated/Models/MagentoLinkedService.cs
@@ -37,7 +37,7 @@ public MagentoLinkedService(DataFactoryElement<string> host)
         /// <param name="useHostVerification"> Specifies whether to require the host name in the server's certificate to match the host name of the server when connecting over SSL. The default value is true. </param>
         /// <param name="usePeerVerification"> Specifies whether to verify the identity of the server when connecting over SSL. The default value is true. </param>
         /// <param name="encryptedCredential"> The encrypted credential used for authentication. Credentials are encrypted using the integration runtime credential manager. Type: string. </param>
-        internal MagentoLinkedService(string linkedServiceType, IntegrationRuntimeReference connectVia, string description, IDictionary<string, EntityParameterSpecification> parameters, IList<BinaryData> annotations, IDictionary<string, BinaryData> additionalProperties, DataFactoryElement<string> host, DataFactorySecretBaseDefinition accessToken, DataFactoryElement<bool> useEncryptedEndpoints, DataFactoryElement<bool> useHostVerification, DataFactoryElement<bool> usePeerVerification, string encryptedCredential) : base(linkedServiceType, connectVia, description, parameters, annotations, additionalProperties)
+        internal MagentoLinkedService(string linkedServiceType, IntegrationRuntimeReference connectVia, string description, IDictionary<string, EntityParameterSpecification> parameters, IList<BinaryData> annotations, IDictionary<string, DataFactoryElement<string>> additionalProperties, DataFactoryElement<string> host, DataFactorySecretBaseDefinition accessToken, DataFactoryElement<bool> useEncryptedEndpoints, DataFactoryElement<bool> useHostVerification, DataFactoryElement<bool> usePeerVerification, string encryptedCredential) : base(linkedServiceType, connectVia, description, parameters, annotations, additionalProperties)
         {
             Host = host;
             AccessToken = accessToken;
diff --git a/src/AzureDataFactory.TestingFramework/Generated/Models/MagentoObjectDataset.Serialization.cs b/src/AzureDataFactory.TestingFramework/Generated/Models/MagentoObjectDataset.Serialization.cs
index e2a9bf8f..5d4beb30 100644
--- a/src/AzureDataFactory.TestingFramework/Generated/Models/MagentoObjectDataset.Serialization.cs
+++ b/src/AzureDataFactory.TestingFramework/Generated/Models/MagentoObjectDataset.Serialization.cs
@@ -104,8 +104,8 @@ internal static MagentoObjectDataset DeserializeMagentoObjectDataset(JsonElement
             Optional<IList<BinaryData>> annotations = default;
             Optional<DatasetFolder> folder = default;
             Optional<DataFactoryElement<string>> tableName = default;
-            IDictionary<string, BinaryData> additionalProperties = default;
-            Dictionary<string, BinaryData> additionalPropertiesDictionary = new Dictionary<string, BinaryData>();
+            IDictionary<string, DataFactoryElement<string>> additionalProperties = default;
+            Dictionary<string, DataFactoryElement<string>> additionalPropertiesDictionary = new Dictionary<string, DataFactoryElement<string>>();
             foreach (var property in element.EnumerateObject())
             {
                 if (property.NameEquals("type"u8))
@@ -206,7 +206,7 @@ internal static MagentoObjectDataset DeserializeMagentoObjectDataset(JsonElement
                     }
                     continue;
                 }
-                additionalPropertiesDictionary.Add(property.Name, BinaryData.FromString(property.Value.GetRawText()));
+                additionalPropertiesDictionary.Add(property.Name, JsonSerializer.Deserialize<DataFactoryElement<string>>(property.Value.GetRawText()));
             }
             additionalProperties = additionalPropertiesDictionary;
             return new MagentoObjectDataset(type, description.Value, structure.Value, schema.Value, linkedServiceName, Optional.ToDictionary(parameters), Optional.ToList(annotations), folder.Value, additionalProperties, tableName.Value);
diff --git a/src/AzureDataFactory.TestingFramework/Generated/Models/MagentoObjectDataset.cs b/src/AzureDataFactory.TestingFramework/Generated/Models/MagentoObjectDataset.cs
index ce1e54ad..5480fd61 100644
--- a/src/AzureDataFactory.TestingFramework/Generated/Models/MagentoObjectDataset.cs
+++ b/src/AzureDataFactory.TestingFramework/Generated/Models/MagentoObjectDataset.cs
@@ -34,7 +34,7 @@ public MagentoObjectDataset(DataFactoryLinkedServiceReference linkedServiceName)
         /// <param name="folder"> The folder that this Dataset is in. If not specified, Dataset will appear at the root level. </param>
         /// <param name="additionalProperties"> Additional Properties. </param>
         /// <param name="tableName"> The table name. Type: string (or Expression with resultType string). </param>
-        internal MagentoObjectDataset(string datasetType, string description, DataFactoryElement<IList<DatasetDataElement>> structure, DataFactoryElement<IList<DatasetSchemaDataElement>> schema, DataFactoryLinkedServiceReference linkedServiceName, IDictionary<string, EntityParameterSpecification> parameters, IList<BinaryData> annotations, DatasetFolder folder, IDictionary<string, BinaryData> additionalProperties, DataFactoryElement<string> tableName) : base(datasetType, description, structure, schema, linkedServiceName, parameters, annotations, folder, additionalProperties)
+        internal MagentoObjectDataset(string datasetType, string description, DataFactoryElement<IList<DatasetDataElement>> structure, DataFactoryElement<IList<DatasetSchemaDataElement>> schema, DataFactoryLinkedServiceReference linkedServiceName, IDictionary<string, EntityParameterSpecification> parameters, IList<BinaryData> annotations, DatasetFolder folder, IDictionary<string, DataFactoryElement<string>> additionalProperties, DataFactoryElement<string> tableName) : base(datasetType, description, structure, schema, linkedServiceName, parameters, annotations, folder, additionalProperties)
         {
             TableName = tableName;
             DatasetType = datasetType ?? "MagentoObject";
diff --git a/src/AzureDataFactory.TestingFramework/Generated/Models/MagentoSource.Serialization.cs b/src/AzureDataFactory.TestingFramework/Generated/Models/MagentoSource.Serialization.cs
index b1adcf37..af025df6 100644
--- a/src/AzureDataFactory.TestingFramework/Generated/Models/MagentoSource.Serialization.cs
+++ b/src/AzureDataFactory.TestingFramework/Generated/Models/MagentoSource.Serialization.cs
@@ -83,8 +83,8 @@ internal static MagentoSource DeserializeMagentoSource(JsonElement element)
             Optional<DataFactoryElement<string>> sourceRetryWait = default;
             Optional<DataFactoryElement<int>> maxConcurrentConnections = default;
             Optional<DataFactoryElement<bool>> disableMetricsCollection = default;
-            IDictionary<string, BinaryData> additionalProperties = default;
-            Dictionary<string, BinaryData> additionalPropertiesDictionary = new Dictionary<string, BinaryData>();
+            IDictionary<string, DataFactoryElement<string>> additionalProperties = default;
+            Dictionary<string, DataFactoryElement<string>> additionalPropertiesDictionary = new Dictionary<string, DataFactoryElement<string>>();
             foreach (var property in element.EnumerateObject())
             {
                 if (property.NameEquals("query"u8))
@@ -155,7 +155,7 @@ internal static MagentoSource DeserializeMagentoSource(JsonElement element)
                     disableMetricsCollection = JsonSerializer.Deserialize<DataFactoryElement<bool>>(property.Value.GetRawText());
                     continue;
                 }
-                additionalPropertiesDictionary.Add(property.Name, BinaryData.FromString(property.Value.GetRawText()));
+                additionalPropertiesDictionary.Add(property.Name, JsonSerializer.Deserialize<DataFactoryElement<string>>(property.Value.GetRawText()));
             }
             additionalProperties = additionalPropertiesDictionary;
             return new MagentoSource(type, sourceRetryCount.Value, sourceRetryWait.Value, maxConcurrentConnections.Value, disableMetricsCollection.Value, additionalProperties, queryTimeout.Value, additionalColumns.Value, query.Value);
diff --git a/src/AzureDataFactory.TestingFramework/Generated/Models/MagentoSource.cs b/src/AzureDataFactory.TestingFramework/Generated/Models/MagentoSource.cs
index 2fc064c2..1e1a4e27 100644
--- a/src/AzureDataFactory.TestingFramework/Generated/Models/MagentoSource.cs
+++ b/src/AzureDataFactory.TestingFramework/Generated/Models/MagentoSource.cs
@@ -28,7 +28,7 @@ public MagentoSource()
         /// <param name="queryTimeout"> Query timeout. Type: string (or Expression with resultType string), pattern: ((\d+)\.)?(\d\d):(60|([0-5][0-9])):(60|([0-5][0-9])). </param>
         /// <param name="additionalColumns"> Specifies the additional columns to be added to source data. Type: array of objects(AdditionalColumns) (or Expression with resultType array of objects). </param>
         /// <param name="query"> A query to retrieve data from source. Type: string (or Expression with resultType string). </param>
-        internal MagentoSource(string copySourceType, DataFactoryElement<int> sourceRetryCount, DataFactoryElement<string> sourceRetryWait, DataFactoryElement<int> maxConcurrentConnections, DataFactoryElement<bool> disableMetricsCollection, IDictionary<string, BinaryData> additionalProperties, DataFactoryElement<string> queryTimeout, BinaryData additionalColumns, DataFactoryElement<string> query) : base(copySourceType, sourceRetryCount, sourceRetryWait, maxConcurrentConnections, disableMetricsCollection, additionalProperties, queryTimeout, additionalColumns)
+        internal MagentoSource(string copySourceType, DataFactoryElement<int> sourceRetryCount, DataFactoryElement<string> sourceRetryWait, DataFactoryElement<int> maxConcurrentConnections, DataFactoryElement<bool> disableMetricsCollection, IDictionary<string, DataFactoryElement<string>> additionalProperties, DataFactoryElement<string> queryTimeout, BinaryData additionalColumns, DataFactoryElement<string> query) : base(copySourceType, sourceRetryCount, sourceRetryWait, maxConcurrentConnections, disableMetricsCollection, additionalProperties, queryTimeout, additionalColumns)
         {
             Query = query;
             CopySourceType = copySourceType ?? "MagentoSource";
diff --git a/src/AzureDataFactory.TestingFramework/Generated/Models/ManagedIntegrationRuntime.Serialization.cs b/src/AzureDataFactory.TestingFramework/Generated/Models/ManagedIntegrationRuntime.Serialization.cs
index 644f2607..b19f4968 100644
--- a/src/AzureDataFactory.TestingFramework/Generated/Models/ManagedIntegrationRuntime.Serialization.cs
+++ b/src/AzureDataFactory.TestingFramework/Generated/Models/ManagedIntegrationRuntime.Serialization.cs
@@ -7,6 +7,7 @@
 
 using System.Text.Json;
 using Azure.Core;
+using Azure.Core.Expressions.DataFactory;
 
 namespace AzureDataFactory.TestingFramework.Models
 {
@@ -70,8 +71,8 @@ internal static ManagedIntegrationRuntime DeserializeManagedIntegrationRuntime(J
             Optional<IntegrationRuntimeComputeProperties> computeProperties = default;
             Optional<IntegrationRuntimeSsisProperties> ssisProperties = default;
             Optional<IntegrationRuntimeCustomerVirtualNetwork> customerVirtualNetwork = default;
-            IDictionary<string, BinaryData> additionalProperties = default;
-            Dictionary<string, BinaryData> additionalPropertiesDictionary = new Dictionary<string, BinaryData>();
+            IDictionary<string, DataFactoryElement<string>> additionalProperties = default;
+            Dictionary<string, DataFactoryElement<string>> additionalPropertiesDictionary = new Dictionary<string, DataFactoryElement<string>>();
             foreach (var property in element.EnumerateObject())
             {
                 if (property.NameEquals("state"u8))
@@ -141,7 +142,7 @@ internal static ManagedIntegrationRuntime DeserializeManagedIntegrationRuntime(J
                     }
                     continue;
                 }
-                additionalPropertiesDictionary.Add(property.Name, BinaryData.FromString(property.Value.GetRawText()));
+                additionalPropertiesDictionary.Add(property.Name, JsonSerializer.Deserialize<DataFactoryElement<string>>(property.Value.GetRawText()));
             }
             additionalProperties = additionalPropertiesDictionary;
             return new ManagedIntegrationRuntime(type, description.Value, additionalProperties, Optional.ToNullable(state), managedVirtualNetwork.Value, computeProperties.Value, ssisProperties.Value, customerVirtualNetwork.Value);
diff --git a/src/AzureDataFactory.TestingFramework/Generated/Models/ManagedIntegrationRuntime.cs b/src/AzureDataFactory.TestingFramework/Generated/Models/ManagedIntegrationRuntime.cs
index 894845d5..2649e181 100644
--- a/src/AzureDataFactory.TestingFramework/Generated/Models/ManagedIntegrationRuntime.cs
+++ b/src/AzureDataFactory.TestingFramework/Generated/Models/ManagedIntegrationRuntime.cs
@@ -6,6 +6,7 @@
 #nullable disable
 
 using Azure.Core;
+using Azure.Core.Expressions.DataFactory;
 
 namespace AzureDataFactory.TestingFramework.Models
 {
@@ -27,7 +28,7 @@ public ManagedIntegrationRuntime()
         /// <param name="computeProperties"> The compute resource for managed integration runtime. </param>
         /// <param name="ssisProperties"> SSIS properties for managed integration runtime. </param>
         /// <param name="customerVirtualNetwork"> The name of virtual network to which Azure-SSIS integration runtime will join. </param>
-        internal ManagedIntegrationRuntime(IntegrationRuntimeType integrationRuntimeType, string description, IDictionary<string, BinaryData> additionalProperties, IntegrationRuntimeState? state, ManagedVirtualNetworkReference managedVirtualNetwork, IntegrationRuntimeComputeProperties computeProperties, IntegrationRuntimeSsisProperties ssisProperties, IntegrationRuntimeCustomerVirtualNetwork customerVirtualNetwork) : base(integrationRuntimeType, description, additionalProperties)
+        internal ManagedIntegrationRuntime(IntegrationRuntimeType integrationRuntimeType, string description, IDictionary<string, DataFactoryElement<string>> additionalProperties, IntegrationRuntimeState? state, ManagedVirtualNetworkReference managedVirtualNetwork, IntegrationRuntimeComputeProperties computeProperties, IntegrationRuntimeSsisProperties ssisProperties, IntegrationRuntimeCustomerVirtualNetwork customerVirtualNetwork) : base(integrationRuntimeType, description, additionalProperties)
         {
             State = state;
             ManagedVirtualNetwork = managedVirtualNetwork;
diff --git a/src/AzureDataFactory.TestingFramework/Generated/Models/ManagedIntegrationRuntimeError.Serialization.cs b/src/AzureDataFactory.TestingFramework/Generated/Models/ManagedIntegrationRuntimeError.Serialization.cs
index 9421faf6..6ce56e5b 100644
--- a/src/AzureDataFactory.TestingFramework/Generated/Models/ManagedIntegrationRuntimeError.Serialization.cs
+++ b/src/AzureDataFactory.TestingFramework/Generated/Models/ManagedIntegrationRuntimeError.Serialization.cs
@@ -7,6 +7,7 @@
 
 using System.Text.Json;
 using Azure.Core;
+using Azure.Core.Expressions.DataFactory;
 
 namespace AzureDataFactory.TestingFramework.Models
 {
@@ -22,8 +23,8 @@ internal static ManagedIntegrationRuntimeError DeserializeManagedIntegrationRunt
             Optional<string> code = default;
             Optional<IReadOnlyList<string>> parameters = default;
             Optional<string> message = default;
-            IReadOnlyDictionary<string, BinaryData> additionalProperties = default;
-            Dictionary<string, BinaryData> additionalPropertiesDictionary = new Dictionary<string, BinaryData>();
+            IReadOnlyDictionary<string, DataFactoryElement<string>> additionalProperties = default;
+            Dictionary<string, DataFactoryElement<string>> additionalPropertiesDictionary = new Dictionary<string, DataFactoryElement<string>>();
             foreach (var property in element.EnumerateObject())
             {
                 if (property.NameEquals("time"u8))
@@ -59,7 +60,7 @@ internal static ManagedIntegrationRuntimeError DeserializeManagedIntegrationRunt
                     message = property.Value.GetString();
                     continue;
                 }
-                additionalPropertiesDictionary.Add(property.Name, BinaryData.FromString(property.Value.GetRawText()));
+                additionalPropertiesDictionary.Add(property.Name, JsonSerializer.Deserialize<DataFactoryElement<string>>(property.Value.GetRawText()));
             }
             additionalProperties = additionalPropertiesDictionary;
             return new ManagedIntegrationRuntimeError(Optional.ToNullable(time), code.Value, Optional.ToList(parameters), message.Value, additionalProperties);
diff --git a/src/AzureDataFactory.TestingFramework/Generated/Models/ManagedIntegrationRuntimeError.cs b/src/AzureDataFactory.TestingFramework/Generated/Models/ManagedIntegrationRuntimeError.cs
index bfc5ef9b..ce1cfe99 100644
--- a/src/AzureDataFactory.TestingFramework/Generated/Models/ManagedIntegrationRuntimeError.cs
+++ b/src/AzureDataFactory.TestingFramework/Generated/Models/ManagedIntegrationRuntimeError.cs
@@ -6,6 +6,7 @@
 #nullable disable
 
 using Azure.Core;
+using Azure.Core.Expressions.DataFactory;
 
 namespace AzureDataFactory.TestingFramework.Models
 {
@@ -16,7 +17,7 @@ public partial class ManagedIntegrationRuntimeError
         internal ManagedIntegrationRuntimeError()
         {
             Parameters = new ChangeTrackingList<string>();
-            AdditionalProperties = new ChangeTrackingDictionary<string, BinaryData>();
+            AdditionalProperties = new ChangeTrackingDictionary<string, DataFactoryElement<string>>();
         }
 
         /// <summary> Initializes a new instance of ManagedIntegrationRuntimeError. </summary>
@@ -25,7 +26,7 @@ internal ManagedIntegrationRuntimeError()
         /// <param name="parameters"> Managed integration runtime error parameters. </param>
         /// <param name="message"> Error message. </param>
         /// <param name="additionalProperties"> Additional Properties. </param>
-        internal ManagedIntegrationRuntimeError(DateTimeOffset? time, string code, IReadOnlyList<string> parameters, string message, IReadOnlyDictionary<string, BinaryData> additionalProperties)
+        internal ManagedIntegrationRuntimeError(DateTimeOffset? time, string code, IReadOnlyList<string> parameters, string message, IReadOnlyDictionary<string, DataFactoryElement<string>> additionalProperties)
         {
             Time = time;
             Code = code;
@@ -72,6 +73,6 @@ internal ManagedIntegrationRuntimeError(DateTimeOffset? time, string code, IRead
         /// </list>
         /// </para>
         /// </summary>
-        public IReadOnlyDictionary<string, BinaryData> AdditionalProperties { get; }
+        public IReadOnlyDictionary<string, DataFactoryElement<string>> AdditionalProperties { get; }
     }
 }
diff --git a/src/AzureDataFactory.TestingFramework/Generated/Models/ManagedIntegrationRuntimeNode.Serialization.cs b/src/AzureDataFactory.TestingFramework/Generated/Models/ManagedIntegrationRuntimeNode.Serialization.cs
index 5e810518..4570d26e 100644
--- a/src/AzureDataFactory.TestingFramework/Generated/Models/ManagedIntegrationRuntimeNode.Serialization.cs
+++ b/src/AzureDataFactory.TestingFramework/Generated/Models/ManagedIntegrationRuntimeNode.Serialization.cs
@@ -7,6 +7,7 @@
 
 using System.Text.Json;
 using Azure.Core;
+using Azure.Core.Expressions.DataFactory;
 
 namespace AzureDataFactory.TestingFramework.Models
 {
@@ -21,8 +22,8 @@ internal static ManagedIntegrationRuntimeNode DeserializeManagedIntegrationRunti
             Optional<string> nodeId = default;
             Optional<ManagedIntegrationRuntimeNodeStatus> status = default;
             Optional<IReadOnlyList<ManagedIntegrationRuntimeError>> errors = default;
-            IReadOnlyDictionary<string, BinaryData> additionalProperties = default;
-            Dictionary<string, BinaryData> additionalPropertiesDictionary = new Dictionary<string, BinaryData>();
+            IReadOnlyDictionary<string, DataFactoryElement<string>> additionalProperties = default;
+            Dictionary<string, DataFactoryElement<string>> additionalPropertiesDictionary = new Dictionary<string, DataFactoryElement<string>>();
             foreach (var property in element.EnumerateObject())
             {
                 if (property.NameEquals("nodeId"u8))
@@ -53,7 +54,7 @@ internal static ManagedIntegrationRuntimeNode DeserializeManagedIntegrationRunti
                     errors = array;
                     continue;
                 }
-                additionalPropertiesDictionary.Add(property.Name, BinaryData.FromString(property.Value.GetRawText()));
+                additionalPropertiesDictionary.Add(property.Name, JsonSerializer.Deserialize<DataFactoryElement<string>>(property.Value.GetRawText()));
             }
             additionalProperties = additionalPropertiesDictionary;
             return new ManagedIntegrationRuntimeNode(nodeId.Value, Optional.ToNullable(status), Optional.ToList(errors), additionalProperties);
diff --git a/src/AzureDataFactory.TestingFramework/Generated/Models/ManagedIntegrationRuntimeNode.cs b/src/AzureDataFactory.TestingFramework/Generated/Models/ManagedIntegrationRuntimeNode.cs
index 99e883bc..41660d2a 100644
--- a/src/AzureDataFactory.TestingFramework/Generated/Models/ManagedIntegrationRuntimeNode.cs
+++ b/src/AzureDataFactory.TestingFramework/Generated/Models/ManagedIntegrationRuntimeNode.cs
@@ -6,6 +6,7 @@
 #nullable disable
 
 using Azure.Core;
+using Azure.Core.Expressions.DataFactory;
 
 namespace AzureDataFactory.TestingFramework.Models
 {
@@ -16,7 +17,7 @@ public partial class ManagedIntegrationRuntimeNode
         internal ManagedIntegrationRuntimeNode()
         {
             Errors = new ChangeTrackingList<ManagedIntegrationRuntimeError>();
-            AdditionalProperties = new ChangeTrackingDictionary<string, BinaryData>();
+            AdditionalProperties = new ChangeTrackingDictionary<string, DataFactoryElement<string>>();
         }
 
         /// <summary> Initializes a new instance of ManagedIntegrationRuntimeNode. </summary>
@@ -24,7 +25,7 @@ internal ManagedIntegrationRuntimeNode()
         /// <param name="status"> The managed integration runtime node status. </param>
         /// <param name="errors"> The errors that occurred on this integration runtime node. </param>
         /// <param name="additionalProperties"> Additional Properties. </param>
-        internal ManagedIntegrationRuntimeNode(string nodeId, ManagedIntegrationRuntimeNodeStatus? status, IReadOnlyList<ManagedIntegrationRuntimeError> errors, IReadOnlyDictionary<string, BinaryData> additionalProperties)
+        internal ManagedIntegrationRuntimeNode(string nodeId, ManagedIntegrationRuntimeNodeStatus? status, IReadOnlyList<ManagedIntegrationRuntimeError> errors, IReadOnlyDictionary<string, DataFactoryElement<string>> additionalProperties)
         {
             NodeId = nodeId;
             Status = status;
@@ -68,6 +69,6 @@ internal ManagedIntegrationRuntimeNode(string nodeId, ManagedIntegrationRuntimeN
         /// </list>
         /// </para>
         /// </summary>
-        public IReadOnlyDictionary<string, BinaryData> AdditionalProperties { get; }
+        public IReadOnlyDictionary<string, DataFactoryElement<string>> AdditionalProperties { get; }
     }
 }
diff --git a/src/AzureDataFactory.TestingFramework/Generated/Models/ManagedIntegrationRuntimeOperationResult.Serialization.cs b/src/AzureDataFactory.TestingFramework/Generated/Models/ManagedIntegrationRuntimeOperationResult.Serialization.cs
index b88e54ff..f5db54eb 100644
--- a/src/AzureDataFactory.TestingFramework/Generated/Models/ManagedIntegrationRuntimeOperationResult.Serialization.cs
+++ b/src/AzureDataFactory.TestingFramework/Generated/Models/ManagedIntegrationRuntimeOperationResult.Serialization.cs
@@ -7,6 +7,7 @@
 
 using System.Text.Json;
 using Azure.Core;
+using Azure.Core.Expressions.DataFactory;
 
 namespace AzureDataFactory.TestingFramework.Models
 {
@@ -24,8 +25,8 @@ internal static ManagedIntegrationRuntimeOperationResult DeserializeManagedInteg
             Optional<string> errorCode = default;
             Optional<IReadOnlyList<string>> parameters = default;
             Optional<string> activityId = default;
-            IReadOnlyDictionary<string, BinaryData> additionalProperties = default;
-            Dictionary<string, BinaryData> additionalPropertiesDictionary = new Dictionary<string, BinaryData>();
+            IReadOnlyDictionary<string, DataFactoryElement<string>> additionalProperties = default;
+            Dictionary<string, DataFactoryElement<string>> additionalPropertiesDictionary = new Dictionary<string, DataFactoryElement<string>>();
             foreach (var property in element.EnumerateObject())
             {
                 if (property.NameEquals("type"u8))
@@ -71,7 +72,7 @@ internal static ManagedIntegrationRuntimeOperationResult DeserializeManagedInteg
                     activityId = property.Value.GetString();
                     continue;
                 }
-                additionalPropertiesDictionary.Add(property.Name, BinaryData.FromString(property.Value.GetRawText()));
+                additionalPropertiesDictionary.Add(property.Name, JsonSerializer.Deserialize<DataFactoryElement<string>>(property.Value.GetRawText()));
             }
             additionalProperties = additionalPropertiesDictionary;
             return new ManagedIntegrationRuntimeOperationResult(type.Value, Optional.ToNullable(startTime), result.Value, errorCode.Value, Optional.ToList(parameters), activityId.Value, additionalProperties);
diff --git a/src/AzureDataFactory.TestingFramework/Generated/Models/ManagedIntegrationRuntimeOperationResult.cs b/src/AzureDataFactory.TestingFramework/Generated/Models/ManagedIntegrationRuntimeOperationResult.cs
index fcb51281..b6ed0cb8 100644
--- a/src/AzureDataFactory.TestingFramework/Generated/Models/ManagedIntegrationRuntimeOperationResult.cs
+++ b/src/AzureDataFactory.TestingFramework/Generated/Models/ManagedIntegrationRuntimeOperationResult.cs
@@ -6,6 +6,7 @@
 #nullable disable
 
 using Azure.Core;
+using Azure.Core.Expressions.DataFactory;
 
 namespace AzureDataFactory.TestingFramework.Models
 {
@@ -16,7 +17,7 @@ public partial class ManagedIntegrationRuntimeOperationResult
         internal ManagedIntegrationRuntimeOperationResult()
         {
             Parameters = new ChangeTrackingList<string>();
-            AdditionalProperties = new ChangeTrackingDictionary<string, BinaryData>();
+            AdditionalProperties = new ChangeTrackingDictionary<string, DataFactoryElement<string>>();
         }
 
         /// <summary> Initializes a new instance of ManagedIntegrationRuntimeOperationResult. </summary>
@@ -27,7 +28,7 @@ internal ManagedIntegrationRuntimeOperationResult()
         /// <param name="parameters"> Managed integration runtime error parameters. </param>
         /// <param name="activityId"> The activity id for the operation request. </param>
         /// <param name="additionalProperties"> Additional Properties. </param>
-        internal ManagedIntegrationRuntimeOperationResult(string managedIntegrationRuntimeOperationResultType, DateTimeOffset? startOn, string result, string errorCode, IReadOnlyList<string> parameters, string activityId, IReadOnlyDictionary<string, BinaryData> additionalProperties)
+        internal ManagedIntegrationRuntimeOperationResult(string managedIntegrationRuntimeOperationResultType, DateTimeOffset? startOn, string result, string errorCode, IReadOnlyList<string> parameters, string activityId, IReadOnlyDictionary<string, DataFactoryElement<string>> additionalProperties)
         {
             ManagedIntegrationRuntimeOperationResultType = managedIntegrationRuntimeOperationResultType;
             StartOn = startOn;
@@ -80,6 +81,6 @@ internal ManagedIntegrationRuntimeOperationResult(string managedIntegrationRunti
         /// </list>
         /// </para>
         /// </summary>
-        public IReadOnlyDictionary<string, BinaryData> AdditionalProperties { get; }
+        public IReadOnlyDictionary<string, DataFactoryElement<string>> AdditionalProperties { get; }
     }
 }
diff --git a/src/AzureDataFactory.TestingFramework/Generated/Models/ManagedIntegrationRuntimeStatus.Serialization.cs b/src/AzureDataFactory.TestingFramework/Generated/Models/ManagedIntegrationRuntimeStatus.Serialization.cs
index 95daf9a8..aebd3f24 100644
--- a/src/AzureDataFactory.TestingFramework/Generated/Models/ManagedIntegrationRuntimeStatus.Serialization.cs
+++ b/src/AzureDataFactory.TestingFramework/Generated/Models/ManagedIntegrationRuntimeStatus.Serialization.cs
@@ -7,6 +7,7 @@
 
 using System.Text.Json;
 using Azure.Core;
+using Azure.Core.Expressions.DataFactory;
 
 namespace AzureDataFactory.TestingFramework.Models
 {
@@ -25,8 +26,8 @@ internal static ManagedIntegrationRuntimeStatus DeserializeManagedIntegrationRun
             Optional<IReadOnlyList<ManagedIntegrationRuntimeNode>> nodes = default;
             Optional<IReadOnlyList<ManagedIntegrationRuntimeError>> otherErrors = default;
             Optional<ManagedIntegrationRuntimeOperationResult> lastOperation = default;
-            IReadOnlyDictionary<string, BinaryData> additionalProperties = default;
-            Dictionary<string, BinaryData> additionalPropertiesDictionary = new Dictionary<string, BinaryData>();
+            IReadOnlyDictionary<string, DataFactoryElement<string>> additionalProperties = default;
+            Dictionary<string, DataFactoryElement<string>> additionalPropertiesDictionary = new Dictionary<string, DataFactoryElement<string>>();
             foreach (var property in element.EnumerateObject())
             {
                 if (property.NameEquals("type"u8))
@@ -106,7 +107,7 @@ internal static ManagedIntegrationRuntimeStatus DeserializeManagedIntegrationRun
                     }
                     continue;
                 }
-                additionalPropertiesDictionary.Add(property.Name, BinaryData.FromString(property.Value.GetRawText()));
+                additionalPropertiesDictionary.Add(property.Name, JsonSerializer.Deserialize<DataFactoryElement<string>>(property.Value.GetRawText()));
             }
             additionalProperties = additionalPropertiesDictionary;
             return new ManagedIntegrationRuntimeStatus(type, dataFactoryName.Value, Optional.ToNullable(state), additionalProperties, Optional.ToNullable(createTime), Optional.ToList(nodes), Optional.ToList(otherErrors), lastOperation.Value);
diff --git a/src/AzureDataFactory.TestingFramework/Generated/Models/ManagedIntegrationRuntimeStatus.cs b/src/AzureDataFactory.TestingFramework/Generated/Models/ManagedIntegrationRuntimeStatus.cs
index 48d1a53a..41f932fc 100644
--- a/src/AzureDataFactory.TestingFramework/Generated/Models/ManagedIntegrationRuntimeStatus.cs
+++ b/src/AzureDataFactory.TestingFramework/Generated/Models/ManagedIntegrationRuntimeStatus.cs
@@ -6,6 +6,7 @@
 #nullable disable
 
 using Azure.Core;
+using Azure.Core.Expressions.DataFactory;
 
 namespace AzureDataFactory.TestingFramework.Models
 {
@@ -29,7 +30,7 @@ internal ManagedIntegrationRuntimeStatus()
         /// <param name="nodes"> The list of nodes for managed integration runtime. </param>
         /// <param name="otherErrors"> The errors that occurred on this integration runtime. </param>
         /// <param name="lastOperation"> The last operation result that occurred on this integration runtime. </param>
-        internal ManagedIntegrationRuntimeStatus(IntegrationRuntimeType runtimeType, string dataFactoryName, IntegrationRuntimeState? state, IReadOnlyDictionary<string, BinaryData> additionalProperties, DateTimeOffset? createdOn, IReadOnlyList<ManagedIntegrationRuntimeNode> nodes, IReadOnlyList<ManagedIntegrationRuntimeError> otherErrors, ManagedIntegrationRuntimeOperationResult lastOperation) : base(runtimeType, dataFactoryName, state, additionalProperties)
+        internal ManagedIntegrationRuntimeStatus(IntegrationRuntimeType runtimeType, string dataFactoryName, IntegrationRuntimeState? state, IReadOnlyDictionary<string, DataFactoryElement<string>> additionalProperties, DateTimeOffset? createdOn, IReadOnlyList<ManagedIntegrationRuntimeNode> nodes, IReadOnlyList<ManagedIntegrationRuntimeError> otherErrors, ManagedIntegrationRuntimeOperationResult lastOperation) : base(runtimeType, dataFactoryName, state, additionalProperties)
         {
             CreatedOn = createdOn;
             Nodes = nodes;
diff --git a/src/AzureDataFactory.TestingFramework/Generated/Models/MariaDBLinkedService.Serialization.cs b/src/AzureDataFactory.TestingFramework/Generated/Models/MariaDBLinkedService.Serialization.cs
index 904f25be..6533ca8f 100644
--- a/src/AzureDataFactory.TestingFramework/Generated/Models/MariaDBLinkedService.Serialization.cs
+++ b/src/AzureDataFactory.TestingFramework/Generated/Models/MariaDBLinkedService.Serialization.cs
@@ -102,8 +102,8 @@ internal static MariaDBLinkedService DeserializeMariaDBLinkedService(JsonElement
             Optional<DataFactoryElement<string>> connectionString = default;
             Optional<DataFactoryKeyVaultSecretReference> password = default;
             Optional<string> encryptedCredential = default;
-            IDictionary<string, BinaryData> additionalProperties = default;
-            Dictionary<string, BinaryData> additionalPropertiesDictionary = new Dictionary<string, BinaryData>();
+            IDictionary<string, DataFactoryElement<string>> additionalProperties = default;
+            Dictionary<string, DataFactoryElement<string>> additionalPropertiesDictionary = new Dictionary<string, DataFactoryElement<string>>();
             foreach (var property in element.EnumerateObject())
             {
                 if (property.NameEquals("type"u8))
@@ -195,7 +195,7 @@ internal static MariaDBLinkedService DeserializeMariaDBLinkedService(JsonElement
                     }
                     continue;
                 }
-                additionalPropertiesDictionary.Add(property.Name, BinaryData.FromString(property.Value.GetRawText()));
+                additionalPropertiesDictionary.Add(property.Name, JsonSerializer.Deserialize<DataFactoryElement<string>>(property.Value.GetRawText()));
             }
             additionalProperties = additionalPropertiesDictionary;
             return new MariaDBLinkedService(type, connectVia.Value, description.Value, Optional.ToDictionary(parameters), Optional.ToList(annotations), additionalProperties, connectionString.Value, password, encryptedCredential.Value);
diff --git a/src/AzureDataFactory.TestingFramework/Generated/Models/MariaDBLinkedService.cs b/src/AzureDataFactory.TestingFramework/Generated/Models/MariaDBLinkedService.cs
index c84cbd5c..2f0bb3dd 100644
--- a/src/AzureDataFactory.TestingFramework/Generated/Models/MariaDBLinkedService.cs
+++ b/src/AzureDataFactory.TestingFramework/Generated/Models/MariaDBLinkedService.cs
@@ -28,7 +28,7 @@ public MariaDBLinkedService()
         /// <param name="connectionString"> An ODBC connection string. Type: string, SecureString or AzureKeyVaultSecretReference. </param>
         /// <param name="password"> The Azure key vault secret reference of password in connection string. </param>
         /// <param name="encryptedCredential"> The encrypted credential used for authentication. Credentials are encrypted using the integration runtime credential manager. Type: string. </param>
-        internal MariaDBLinkedService(string linkedServiceType, IntegrationRuntimeReference connectVia, string description, IDictionary<string, EntityParameterSpecification> parameters, IList<BinaryData> annotations, IDictionary<string, BinaryData> additionalProperties, DataFactoryElement<string> connectionString, DataFactoryKeyVaultSecretReference password, string encryptedCredential) : base(linkedServiceType, connectVia, description, parameters, annotations, additionalProperties)
+        internal MariaDBLinkedService(string linkedServiceType, IntegrationRuntimeReference connectVia, string description, IDictionary<string, EntityParameterSpecification> parameters, IList<BinaryData> annotations, IDictionary<string, DataFactoryElement<string>> additionalProperties, DataFactoryElement<string> connectionString, DataFactoryKeyVaultSecretReference password, string encryptedCredential) : base(linkedServiceType, connectVia, description, parameters, annotations, additionalProperties)
         {
             ConnectionString = connectionString;
             Password = password;
diff --git a/src/AzureDataFactory.TestingFramework/Generated/Models/MariaDBSource.Serialization.cs b/src/AzureDataFactory.TestingFramework/Generated/Models/MariaDBSource.Serialization.cs
index 00db58cc..b94b2957 100644
--- a/src/AzureDataFactory.TestingFramework/Generated/Models/MariaDBSource.Serialization.cs
+++ b/src/AzureDataFactory.TestingFramework/Generated/Models/MariaDBSource.Serialization.cs
@@ -83,8 +83,8 @@ internal static MariaDBSource DeserializeMariaDBSource(JsonElement element)
             Optional<DataFactoryElement<string>> sourceRetryWait = default;
             Optional<DataFactoryElement<int>> maxConcurrentConnections = default;
             Optional<DataFactoryElement<bool>> disableMetricsCollection = default;
-            IDictionary<string, BinaryData> additionalProperties = default;
-            Dictionary<string, BinaryData> additionalPropertiesDictionary = new Dictionary<string, BinaryData>();
+            IDictionary<string, DataFactoryElement<string>> additionalProperties = default;
+            Dictionary<string, DataFactoryElement<string>> additionalPropertiesDictionary = new Dictionary<string, DataFactoryElement<string>>();
             foreach (var property in element.EnumerateObject())
             {
                 if (property.NameEquals("query"u8))
@@ -155,7 +155,7 @@ internal static MariaDBSource DeserializeMariaDBSource(JsonElement element)
                     disableMetricsCollection = JsonSerializer.Deserialize<DataFactoryElement<bool>>(property.Value.GetRawText());
                     continue;
                 }
-                additionalPropertiesDictionary.Add(property.Name, BinaryData.FromString(property.Value.GetRawText()));
+                additionalPropertiesDictionary.Add(property.Name, JsonSerializer.Deserialize<DataFactoryElement<string>>(property.Value.GetRawText()));
             }
             additionalProperties = additionalPropertiesDictionary;
             return new MariaDBSource(type, sourceRetryCount.Value, sourceRetryWait.Value, maxConcurrentConnections.Value, disableMetricsCollection.Value, additionalProperties, queryTimeout.Value, additionalColumns.Value, query.Value);
diff --git a/src/AzureDataFactory.TestingFramework/Generated/Models/MariaDBSource.cs b/src/AzureDataFactory.TestingFramework/Generated/Models/MariaDBSource.cs
index 2ee33624..c4e2afb2 100644
--- a/src/AzureDataFactory.TestingFramework/Generated/Models/MariaDBSource.cs
+++ b/src/AzureDataFactory.TestingFramework/Generated/Models/MariaDBSource.cs
@@ -28,7 +28,7 @@ public MariaDBSource()
         /// <param name="queryTimeout"> Query timeout. Type: string (or Expression with resultType string), pattern: ((\d+)\.)?(\d\d):(60|([0-5][0-9])):(60|([0-5][0-9])). </param>
         /// <param name="additionalColumns"> Specifies the additional columns to be added to source data. Type: array of objects(AdditionalColumns) (or Expression with resultType array of objects). </param>
         /// <param name="query"> A query to retrieve data from source. Type: string (or Expression with resultType string). </param>
-        internal MariaDBSource(string copySourceType, DataFactoryElement<int> sourceRetryCount, DataFactoryElement<string> sourceRetryWait, DataFactoryElement<int> maxConcurrentConnections, DataFactoryElement<bool> disableMetricsCollection, IDictionary<string, BinaryData> additionalProperties, DataFactoryElement<string> queryTimeout, BinaryData additionalColumns, DataFactoryElement<string> query) : base(copySourceType, sourceRetryCount, sourceRetryWait, maxConcurrentConnections, disableMetricsCollection, additionalProperties, queryTimeout, additionalColumns)
+        internal MariaDBSource(string copySourceType, DataFactoryElement<int> sourceRetryCount, DataFactoryElement<string> sourceRetryWait, DataFactoryElement<int> maxConcurrentConnections, DataFactoryElement<bool> disableMetricsCollection, IDictionary<string, DataFactoryElement<string>> additionalProperties, DataFactoryElement<string> queryTimeout, BinaryData additionalColumns, DataFactoryElement<string> query) : base(copySourceType, sourceRetryCount, sourceRetryWait, maxConcurrentConnections, disableMetricsCollection, additionalProperties, queryTimeout, additionalColumns)
         {
             Query = query;
             CopySourceType = copySourceType ?? "MariaDBSource";
diff --git a/src/AzureDataFactory.TestingFramework/Generated/Models/MariaDBTableDataset.Serialization.cs b/src/AzureDataFactory.TestingFramework/Generated/Models/MariaDBTableDataset.Serialization.cs
index 4ec2d5a0..1747fa2f 100644
--- a/src/AzureDataFactory.TestingFramework/Generated/Models/MariaDBTableDataset.Serialization.cs
+++ b/src/AzureDataFactory.TestingFramework/Generated/Models/MariaDBTableDataset.Serialization.cs
@@ -104,8 +104,8 @@ internal static MariaDBTableDataset DeserializeMariaDBTableDataset(JsonElement e
             Optional<IList<BinaryData>> annotations = default;
             Optional<DatasetFolder> folder = default;
             Optional<DataFactoryElement<string>> tableName = default;
-            IDictionary<string, BinaryData> additionalProperties = default;
-            Dictionary<string, BinaryData> additionalPropertiesDictionary = new Dictionary<string, BinaryData>();
+            IDictionary<string, DataFactoryElement<string>> additionalProperties = default;
+            Dictionary<string, DataFactoryElement<string>> additionalPropertiesDictionary = new Dictionary<string, DataFactoryElement<string>>();
             foreach (var property in element.EnumerateObject())
             {
                 if (property.NameEquals("type"u8))
@@ -206,7 +206,7 @@ internal static MariaDBTableDataset DeserializeMariaDBTableDataset(JsonElement e
                     }
                     continue;
                 }
-                additionalPropertiesDictionary.Add(property.Name, BinaryData.FromString(property.Value.GetRawText()));
+                additionalPropertiesDictionary.Add(property.Name, JsonSerializer.Deserialize<DataFactoryElement<string>>(property.Value.GetRawText()));
             }
             additionalProperties = additionalPropertiesDictionary;
             return new MariaDBTableDataset(type, description.Value, structure.Value, schema.Value, linkedServiceName, Optional.ToDictionary(parameters), Optional.ToList(annotations), folder.Value, additionalProperties, tableName.Value);
diff --git a/src/AzureDataFactory.TestingFramework/Generated/Models/MariaDBTableDataset.cs b/src/AzureDataFactory.TestingFramework/Generated/Models/MariaDBTableDataset.cs
index c3f0cda4..83f9f9e7 100644
--- a/src/AzureDataFactory.TestingFramework/Generated/Models/MariaDBTableDataset.cs
+++ b/src/AzureDataFactory.TestingFramework/Generated/Models/MariaDBTableDataset.cs
@@ -34,7 +34,7 @@ public MariaDBTableDataset(DataFactoryLinkedServiceReference linkedServiceName)
         /// <param name="folder"> The folder that this Dataset is in. If not specified, Dataset will appear at the root level. </param>
         /// <param name="additionalProperties"> Additional Properties. </param>
         /// <param name="tableName"> The table name. Type: string (or Expression with resultType string). </param>
-        internal MariaDBTableDataset(string datasetType, string description, DataFactoryElement<IList<DatasetDataElement>> structure, DataFactoryElement<IList<DatasetSchemaDataElement>> schema, DataFactoryLinkedServiceReference linkedServiceName, IDictionary<string, EntityParameterSpecification> parameters, IList<BinaryData> annotations, DatasetFolder folder, IDictionary<string, BinaryData> additionalProperties, DataFactoryElement<string> tableName) : base(datasetType, description, structure, schema, linkedServiceName, parameters, annotations, folder, additionalProperties)
+        internal MariaDBTableDataset(string datasetType, string description, DataFactoryElement<IList<DatasetDataElement>> structure, DataFactoryElement<IList<DatasetSchemaDataElement>> schema, DataFactoryLinkedServiceReference linkedServiceName, IDictionary<string, EntityParameterSpecification> parameters, IList<BinaryData> annotations, DatasetFolder folder, IDictionary<string, DataFactoryElement<string>> additionalProperties, DataFactoryElement<string> tableName) : base(datasetType, description, structure, schema, linkedServiceName, parameters, annotations, folder, additionalProperties)
         {
             TableName = tableName;
             DatasetType = datasetType ?? "MariaDBTable";
diff --git a/src/AzureDataFactory.TestingFramework/Generated/Models/MarketoLinkedService.Serialization.cs b/src/AzureDataFactory.TestingFramework/Generated/Models/MarketoLinkedService.Serialization.cs
index 89d1231e..f4811900 100644
--- a/src/AzureDataFactory.TestingFramework/Generated/Models/MarketoLinkedService.Serialization.cs
+++ b/src/AzureDataFactory.TestingFramework/Generated/Models/MarketoLinkedService.Serialization.cs
@@ -120,8 +120,8 @@ internal static MarketoLinkedService DeserializeMarketoLinkedService(JsonElement
             Optional<DataFactoryElement<bool>> useHostVerification = default;
             Optional<DataFactoryElement<bool>> usePeerVerification = default;
             Optional<string> encryptedCredential = default;
-            IDictionary<string, BinaryData> additionalProperties = default;
-            Dictionary<string, BinaryData> additionalPropertiesDictionary = new Dictionary<string, BinaryData>();
+            IDictionary<string, DataFactoryElement<string>> additionalProperties = default;
+            Dictionary<string, DataFactoryElement<string>> additionalPropertiesDictionary = new Dictionary<string, DataFactoryElement<string>>();
             foreach (var property in element.EnumerateObject())
             {
                 if (property.NameEquals("type"u8))
@@ -241,7 +241,7 @@ internal static MarketoLinkedService DeserializeMarketoLinkedService(JsonElement
                     }
                     continue;
                 }
-                additionalPropertiesDictionary.Add(property.Name, BinaryData.FromString(property.Value.GetRawText()));
+                additionalPropertiesDictionary.Add(property.Name, JsonSerializer.Deserialize<DataFactoryElement<string>>(property.Value.GetRawText()));
             }
             additionalProperties = additionalPropertiesDictionary;
             return new MarketoLinkedService(type, connectVia.Value, description.Value, Optional.ToDictionary(parameters), Optional.ToList(annotations), additionalProperties, endpoint, clientId, clientSecret, useEncryptedEndpoints.Value, useHostVerification.Value, usePeerVerification.Value, encryptedCredential.Value);
diff --git a/src/AzureDataFactory.TestingFramework/Generated/Models/MarketoLinkedService.cs b/src/AzureDataFactory.TestingFramework/Generated/Models/MarketoLinkedService.cs
index 0d4c1cbd..1a2968db 100644
--- a/src/AzureDataFactory.TestingFramework/Generated/Models/MarketoLinkedService.cs
+++ b/src/AzureDataFactory.TestingFramework/Generated/Models/MarketoLinkedService.cs
@@ -41,7 +41,7 @@ public MarketoLinkedService(DataFactoryElement<string> endpoint, DataFactoryElem
         /// <param name="useHostVerification"> Specifies whether to require the host name in the server's certificate to match the host name of the server when connecting over SSL. The default value is true. </param>
         /// <param name="usePeerVerification"> Specifies whether to verify the identity of the server when connecting over SSL. The default value is true. </param>
         /// <param name="encryptedCredential"> The encrypted credential used for authentication. Credentials are encrypted using the integration runtime credential manager. Type: string. </param>
-        internal MarketoLinkedService(string linkedServiceType, IntegrationRuntimeReference connectVia, string description, IDictionary<string, EntityParameterSpecification> parameters, IList<BinaryData> annotations, IDictionary<string, BinaryData> additionalProperties, DataFactoryElement<string> endpoint, DataFactoryElement<string> clientId, DataFactorySecretBaseDefinition clientSecret, DataFactoryElement<bool> useEncryptedEndpoints, DataFactoryElement<bool> useHostVerification, DataFactoryElement<bool> usePeerVerification, string encryptedCredential) : base(linkedServiceType, connectVia, description, parameters, annotations, additionalProperties)
+        internal MarketoLinkedService(string linkedServiceType, IntegrationRuntimeReference connectVia, string description, IDictionary<string, EntityParameterSpecification> parameters, IList<BinaryData> annotations, IDictionary<string, DataFactoryElement<string>> additionalProperties, DataFactoryElement<string> endpoint, DataFactoryElement<string> clientId, DataFactorySecretBaseDefinition clientSecret, DataFactoryElement<bool> useEncryptedEndpoints, DataFactoryElement<bool> useHostVerification, DataFactoryElement<bool> usePeerVerification, string encryptedCredential) : base(linkedServiceType, connectVia, description, parameters, annotations, additionalProperties)
         {
             Endpoint = endpoint;
             ClientId = clientId;
diff --git a/src/AzureDataFactory.TestingFramework/Generated/Models/MarketoObjectDataset.Serialization.cs b/src/AzureDataFactory.TestingFramework/Generated/Models/MarketoObjectDataset.Serialization.cs
index cc3d17be..db66658b 100644
--- a/src/AzureDataFactory.TestingFramework/Generated/Models/MarketoObjectDataset.Serialization.cs
+++ b/src/AzureDataFactory.TestingFramework/Generated/Models/MarketoObjectDataset.Serialization.cs
@@ -104,8 +104,8 @@ internal static MarketoObjectDataset DeserializeMarketoObjectDataset(JsonElement
             Optional<IList<BinaryData>> annotations = default;
             Optional<DatasetFolder> folder = default;
             Optional<DataFactoryElement<string>> tableName = default;
-            IDictionary<string, BinaryData> additionalProperties = default;
-            Dictionary<string, BinaryData> additionalPropertiesDictionary = new Dictionary<string, BinaryData>();
+            IDictionary<string, DataFactoryElement<string>> additionalProperties = default;
+            Dictionary<string, DataFactoryElement<string>> additionalPropertiesDictionary = new Dictionary<string, DataFactoryElement<string>>();
             foreach (var property in element.EnumerateObject())
             {
                 if (property.NameEquals("type"u8))
@@ -206,7 +206,7 @@ internal static MarketoObjectDataset DeserializeMarketoObjectDataset(JsonElement
                     }
                     continue;
                 }
-                additionalPropertiesDictionary.Add(property.Name, BinaryData.FromString(property.Value.GetRawText()));
+                additionalPropertiesDictionary.Add(property.Name, JsonSerializer.Deserialize<DataFactoryElement<string>>(property.Value.GetRawText()));
             }
             additionalProperties = additionalPropertiesDictionary;
             return new MarketoObjectDataset(type, description.Value, structure.Value, schema.Value, linkedServiceName, Optional.ToDictionary(parameters), Optional.ToList(annotations), folder.Value, additionalProperties, tableName.Value);
diff --git a/src/AzureDataFactory.TestingFramework/Generated/Models/MarketoObjectDataset.cs b/src/AzureDataFactory.TestingFramework/Generated/Models/MarketoObjectDataset.cs
index 036ea888..d532295b 100644
--- a/src/AzureDataFactory.TestingFramework/Generated/Models/MarketoObjectDataset.cs
+++ b/src/AzureDataFactory.TestingFramework/Generated/Models/MarketoObjectDataset.cs
@@ -34,7 +34,7 @@ public MarketoObjectDataset(DataFactoryLinkedServiceReference linkedServiceName)
         /// <param name="folder"> The folder that this Dataset is in. If not specified, Dataset will appear at the root level. </param>
         /// <param name="additionalProperties"> Additional Properties. </param>
         /// <param name="tableName"> The table name. Type: string (or Expression with resultType string). </param>
-        internal MarketoObjectDataset(string datasetType, string description, DataFactoryElement<IList<DatasetDataElement>> structure, DataFactoryElement<IList<DatasetSchemaDataElement>> schema, DataFactoryLinkedServiceReference linkedServiceName, IDictionary<string, EntityParameterSpecification> parameters, IList<BinaryData> annotations, DatasetFolder folder, IDictionary<string, BinaryData> additionalProperties, DataFactoryElement<string> tableName) : base(datasetType, description, structure, schema, linkedServiceName, parameters, annotations, folder, additionalProperties)
+        internal MarketoObjectDataset(string datasetType, string description, DataFactoryElement<IList<DatasetDataElement>> structure, DataFactoryElement<IList<DatasetSchemaDataElement>> schema, DataFactoryLinkedServiceReference linkedServiceName, IDictionary<string, EntityParameterSpecification> parameters, IList<BinaryData> annotations, DatasetFolder folder, IDictionary<string, DataFactoryElement<string>> additionalProperties, DataFactoryElement<string> tableName) : base(datasetType, description, structure, schema, linkedServiceName, parameters, annotations, folder, additionalProperties)
         {
             TableName = tableName;
             DatasetType = datasetType ?? "MarketoObject";
diff --git a/src/AzureDataFactory.TestingFramework/Generated/Models/MarketoSource.Serialization.cs b/src/AzureDataFactory.TestingFramework/Generated/Models/MarketoSource.Serialization.cs
index 02d54e7e..cff1b578 100644
--- a/src/AzureDataFactory.TestingFramework/Generated/Models/MarketoSource.Serialization.cs
+++ b/src/AzureDataFactory.TestingFramework/Generated/Models/MarketoSource.Serialization.cs
@@ -83,8 +83,8 @@ internal static MarketoSource DeserializeMarketoSource(JsonElement element)
             Optional<DataFactoryElement<string>> sourceRetryWait = default;
             Optional<DataFactoryElement<int>> maxConcurrentConnections = default;
             Optional<DataFactoryElement<bool>> disableMetricsCollection = default;
-            IDictionary<string, BinaryData> additionalProperties = default;
-            Dictionary<string, BinaryData> additionalPropertiesDictionary = new Dictionary<string, BinaryData>();
+            IDictionary<string, DataFactoryElement<string>> additionalProperties = default;
+            Dictionary<string, DataFactoryElement<string>> additionalPropertiesDictionary = new Dictionary<string, DataFactoryElement<string>>();
             foreach (var property in element.EnumerateObject())
             {
                 if (property.NameEquals("query"u8))
@@ -155,7 +155,7 @@ internal static MarketoSource DeserializeMarketoSource(JsonElement element)
                     disableMetricsCollection = JsonSerializer.Deserialize<DataFactoryElement<bool>>(property.Value.GetRawText());
                     continue;
                 }
-                additionalPropertiesDictionary.Add(property.Name, BinaryData.FromString(property.Value.GetRawText()));
+                additionalPropertiesDictionary.Add(property.Name, JsonSerializer.Deserialize<DataFactoryElement<string>>(property.Value.GetRawText()));
             }
             additionalProperties = additionalPropertiesDictionary;
             return new MarketoSource(type, sourceRetryCount.Value, sourceRetryWait.Value, maxConcurrentConnections.Value, disableMetricsCollection.Value, additionalProperties, queryTimeout.Value, additionalColumns.Value, query.Value);
diff --git a/src/AzureDataFactory.TestingFramework/Generated/Models/MarketoSource.cs b/src/AzureDataFactory.TestingFramework/Generated/Models/MarketoSource.cs
index e9c447a8..d1072be8 100644
--- a/src/AzureDataFactory.TestingFramework/Generated/Models/MarketoSource.cs
+++ b/src/AzureDataFactory.TestingFramework/Generated/Models/MarketoSource.cs
@@ -28,7 +28,7 @@ public MarketoSource()
         /// <param name="queryTimeout"> Query timeout. Type: string (or Expression with resultType string), pattern: ((\d+)\.)?(\d\d):(60|([0-5][0-9])):(60|([0-5][0-9])). </param>
         /// <param name="additionalColumns"> Specifies the additional columns to be added to source data. Type: array of objects(AdditionalColumns) (or Expression with resultType array of objects). </param>
         /// <param name="query"> A query to retrieve data from source. Type: string (or Expression with resultType string). </param>
-        internal MarketoSource(string copySourceType, DataFactoryElement<int> sourceRetryCount, DataFactoryElement<string> sourceRetryWait, DataFactoryElement<int> maxConcurrentConnections, DataFactoryElement<bool> disableMetricsCollection, IDictionary<string, BinaryData> additionalProperties, DataFactoryElement<string> queryTimeout, BinaryData additionalColumns, DataFactoryElement<string> query) : base(copySourceType, sourceRetryCount, sourceRetryWait, maxConcurrentConnections, disableMetricsCollection, additionalProperties, queryTimeout, additionalColumns)
+        internal MarketoSource(string copySourceType, DataFactoryElement<int> sourceRetryCount, DataFactoryElement<string> sourceRetryWait, DataFactoryElement<int> maxConcurrentConnections, DataFactoryElement<bool> disableMetricsCollection, IDictionary<string, DataFactoryElement<string>> additionalProperties, DataFactoryElement<string> queryTimeout, BinaryData additionalColumns, DataFactoryElement<string> query) : base(copySourceType, sourceRetryCount, sourceRetryWait, maxConcurrentConnections, disableMetricsCollection, additionalProperties, queryTimeout, additionalColumns)
         {
             Query = query;
             CopySourceType = copySourceType ?? "MarketoSource";
diff --git a/src/AzureDataFactory.TestingFramework/Generated/Models/MicrosoftAccessLinkedService.Serialization.cs b/src/AzureDataFactory.TestingFramework/Generated/Models/MicrosoftAccessLinkedService.Serialization.cs
index 17c1465a..0ab38351 100644
--- a/src/AzureDataFactory.TestingFramework/Generated/Models/MicrosoftAccessLinkedService.Serialization.cs
+++ b/src/AzureDataFactory.TestingFramework/Generated/Models/MicrosoftAccessLinkedService.Serialization.cs
@@ -117,8 +117,8 @@ internal static MicrosoftAccessLinkedService DeserializeMicrosoftAccessLinkedSer
             Optional<DataFactoryElement<string>> userName = default;
             Optional<DataFactorySecretBaseDefinition> password = default;
             Optional<string> encryptedCredential = default;
-            IDictionary<string, BinaryData> additionalProperties = default;
-            Dictionary<string, BinaryData> additionalPropertiesDictionary = new Dictionary<string, BinaryData>();
+            IDictionary<string, DataFactoryElement<string>> additionalProperties = default;
+            Dictionary<string, DataFactoryElement<string>> additionalPropertiesDictionary = new Dictionary<string, DataFactoryElement<string>>();
             foreach (var property in element.EnumerateObject())
             {
                 if (property.NameEquals("type"u8))
@@ -233,7 +233,7 @@ internal static MicrosoftAccessLinkedService DeserializeMicrosoftAccessLinkedSer
                     }
                     continue;
                 }
-                additionalPropertiesDictionary.Add(property.Name, BinaryData.FromString(property.Value.GetRawText()));
+                additionalPropertiesDictionary.Add(property.Name, JsonSerializer.Deserialize<DataFactoryElement<string>>(property.Value.GetRawText()));
             }
             additionalProperties = additionalPropertiesDictionary;
             return new MicrosoftAccessLinkedService(type, connectVia.Value, description.Value, Optional.ToDictionary(parameters), Optional.ToList(annotations), additionalProperties, connectionString, authenticationType.Value, credential, userName.Value, password, encryptedCredential.Value);
diff --git a/src/AzureDataFactory.TestingFramework/Generated/Models/MicrosoftAccessLinkedService.cs b/src/AzureDataFactory.TestingFramework/Generated/Models/MicrosoftAccessLinkedService.cs
index 2581afcb..8c6d6d9c 100644
--- a/src/AzureDataFactory.TestingFramework/Generated/Models/MicrosoftAccessLinkedService.cs
+++ b/src/AzureDataFactory.TestingFramework/Generated/Models/MicrosoftAccessLinkedService.cs
@@ -37,7 +37,7 @@ public MicrosoftAccessLinkedService(DataFactoryElement<string> connectionString)
         /// <param name="userName"> User name for Basic authentication. Type: string (or Expression with resultType string). </param>
         /// <param name="password"> Password for Basic authentication. </param>
         /// <param name="encryptedCredential"> The encrypted credential used for authentication. Credentials are encrypted using the integration runtime credential manager. Type: string. </param>
-        internal MicrosoftAccessLinkedService(string linkedServiceType, IntegrationRuntimeReference connectVia, string description, IDictionary<string, EntityParameterSpecification> parameters, IList<BinaryData> annotations, IDictionary<string, BinaryData> additionalProperties, DataFactoryElement<string> connectionString, DataFactoryElement<string> authenticationType, DataFactorySecretBaseDefinition credential, DataFactoryElement<string> userName, DataFactorySecretBaseDefinition password, string encryptedCredential) : base(linkedServiceType, connectVia, description, parameters, annotations, additionalProperties)
+        internal MicrosoftAccessLinkedService(string linkedServiceType, IntegrationRuntimeReference connectVia, string description, IDictionary<string, EntityParameterSpecification> parameters, IList<BinaryData> annotations, IDictionary<string, DataFactoryElement<string>> additionalProperties, DataFactoryElement<string> connectionString, DataFactoryElement<string> authenticationType, DataFactorySecretBaseDefinition credential, DataFactoryElement<string> userName, DataFactorySecretBaseDefinition password, string encryptedCredential) : base(linkedServiceType, connectVia, description, parameters, annotations, additionalProperties)
         {
             ConnectionString = connectionString;
             AuthenticationType = authenticationType;
diff --git a/src/AzureDataFactory.TestingFramework/Generated/Models/MicrosoftAccessSink.Serialization.cs b/src/AzureDataFactory.TestingFramework/Generated/Models/MicrosoftAccessSink.Serialization.cs
index d55d9800..6fe939f7 100644
--- a/src/AzureDataFactory.TestingFramework/Generated/Models/MicrosoftAccessSink.Serialization.cs
+++ b/src/AzureDataFactory.TestingFramework/Generated/Models/MicrosoftAccessSink.Serialization.cs
@@ -79,8 +79,8 @@ internal static MicrosoftAccessSink DeserializeMicrosoftAccessSink(JsonElement e
             Optional<DataFactoryElement<string>> sinkRetryWait = default;
             Optional<DataFactoryElement<int>> maxConcurrentConnections = default;
             Optional<DataFactoryElement<bool>> disableMetricsCollection = default;
-            IDictionary<string, BinaryData> additionalProperties = default;
-            Dictionary<string, BinaryData> additionalPropertiesDictionary = new Dictionary<string, BinaryData>();
+            IDictionary<string, DataFactoryElement<string>> additionalProperties = default;
+            Dictionary<string, DataFactoryElement<string>> additionalPropertiesDictionary = new Dictionary<string, DataFactoryElement<string>>();
             foreach (var property in element.EnumerateObject())
             {
                 if (property.NameEquals("preCopyScript"u8))
@@ -151,7 +151,7 @@ internal static MicrosoftAccessSink DeserializeMicrosoftAccessSink(JsonElement e
                     disableMetricsCollection = JsonSerializer.Deserialize<DataFactoryElement<bool>>(property.Value.GetRawText());
                     continue;
                 }
-                additionalPropertiesDictionary.Add(property.Name, BinaryData.FromString(property.Value.GetRawText()));
+                additionalPropertiesDictionary.Add(property.Name, JsonSerializer.Deserialize<DataFactoryElement<string>>(property.Value.GetRawText()));
             }
             additionalProperties = additionalPropertiesDictionary;
             return new MicrosoftAccessSink(type, writeBatchSize.Value, writeBatchTimeout.Value, sinkRetryCount.Value, sinkRetryWait.Value, maxConcurrentConnections.Value, disableMetricsCollection.Value, additionalProperties, preCopyScript.Value);
diff --git a/src/AzureDataFactory.TestingFramework/Generated/Models/MicrosoftAccessSink.cs b/src/AzureDataFactory.TestingFramework/Generated/Models/MicrosoftAccessSink.cs
index f2e73d0d..6f3e963b 100644
--- a/src/AzureDataFactory.TestingFramework/Generated/Models/MicrosoftAccessSink.cs
+++ b/src/AzureDataFactory.TestingFramework/Generated/Models/MicrosoftAccessSink.cs
@@ -28,7 +28,7 @@ public MicrosoftAccessSink()
         /// <param name="disableMetricsCollection"> If true, disable data store metrics collection. Default is false. Type: boolean (or Expression with resultType boolean). </param>
         /// <param name="additionalProperties"> Additional Properties. </param>
         /// <param name="preCopyScript"> A query to execute before starting the copy. Type: string (or Expression with resultType string). </param>
-        internal MicrosoftAccessSink(string copySinkType, DataFactoryElement<int> writeBatchSize, DataFactoryElement<string> writeBatchTimeout, DataFactoryElement<int> sinkRetryCount, DataFactoryElement<string> sinkRetryWait, DataFactoryElement<int> maxConcurrentConnections, DataFactoryElement<bool> disableMetricsCollection, IDictionary<string, BinaryData> additionalProperties, DataFactoryElement<string> preCopyScript) : base(copySinkType, writeBatchSize, writeBatchTimeout, sinkRetryCount, sinkRetryWait, maxConcurrentConnections, disableMetricsCollection, additionalProperties)
+        internal MicrosoftAccessSink(string copySinkType, DataFactoryElement<int> writeBatchSize, DataFactoryElement<string> writeBatchTimeout, DataFactoryElement<int> sinkRetryCount, DataFactoryElement<string> sinkRetryWait, DataFactoryElement<int> maxConcurrentConnections, DataFactoryElement<bool> disableMetricsCollection, IDictionary<string, DataFactoryElement<string>> additionalProperties, DataFactoryElement<string> preCopyScript) : base(copySinkType, writeBatchSize, writeBatchTimeout, sinkRetryCount, sinkRetryWait, maxConcurrentConnections, disableMetricsCollection, additionalProperties)
         {
             PreCopyScript = preCopyScript;
             CopySinkType = copySinkType ?? "MicrosoftAccessSink";
diff --git a/src/AzureDataFactory.TestingFramework/Generated/Models/MicrosoftAccessSource.Serialization.cs b/src/AzureDataFactory.TestingFramework/Generated/Models/MicrosoftAccessSource.Serialization.cs
index f2ca1ab8..d45ef9c0 100644
--- a/src/AzureDataFactory.TestingFramework/Generated/Models/MicrosoftAccessSource.Serialization.cs
+++ b/src/AzureDataFactory.TestingFramework/Generated/Models/MicrosoftAccessSource.Serialization.cs
@@ -77,8 +77,8 @@ internal static MicrosoftAccessSource DeserializeMicrosoftAccessSource(JsonEleme
             Optional<DataFactoryElement<string>> sourceRetryWait = default;
             Optional<DataFactoryElement<int>> maxConcurrentConnections = default;
             Optional<DataFactoryElement<bool>> disableMetricsCollection = default;
-            IDictionary<string, BinaryData> additionalProperties = default;
-            Dictionary<string, BinaryData> additionalPropertiesDictionary = new Dictionary<string, BinaryData>();
+            IDictionary<string, DataFactoryElement<string>> additionalProperties = default;
+            Dictionary<string, DataFactoryElement<string>> additionalPropertiesDictionary = new Dictionary<string, DataFactoryElement<string>>();
             foreach (var property in element.EnumerateObject())
             {
                 if (property.NameEquals("query"u8))
@@ -140,7 +140,7 @@ internal static MicrosoftAccessSource DeserializeMicrosoftAccessSource(JsonEleme
                     disableMetricsCollection = JsonSerializer.Deserialize<DataFactoryElement<bool>>(property.Value.GetRawText());
                     continue;
                 }
-                additionalPropertiesDictionary.Add(property.Name, BinaryData.FromString(property.Value.GetRawText()));
+                additionalPropertiesDictionary.Add(property.Name, JsonSerializer.Deserialize<DataFactoryElement<string>>(property.Value.GetRawText()));
             }
             additionalProperties = additionalPropertiesDictionary;
             return new MicrosoftAccessSource(type, sourceRetryCount.Value, sourceRetryWait.Value, maxConcurrentConnections.Value, disableMetricsCollection.Value, additionalProperties, query.Value, additionalColumns.Value);
diff --git a/src/AzureDataFactory.TestingFramework/Generated/Models/MicrosoftAccessSource.cs b/src/AzureDataFactory.TestingFramework/Generated/Models/MicrosoftAccessSource.cs
index be894567..a3a06af3 100644
--- a/src/AzureDataFactory.TestingFramework/Generated/Models/MicrosoftAccessSource.cs
+++ b/src/AzureDataFactory.TestingFramework/Generated/Models/MicrosoftAccessSource.cs
@@ -27,7 +27,7 @@ public MicrosoftAccessSource()
         /// <param name="additionalProperties"> Additional Properties. </param>
         /// <param name="query"> Database query. Type: string (or Expression with resultType string). </param>
         /// <param name="additionalColumns"> Specifies the additional columns to be added to source data. Type: array of objects(AdditionalColumns) (or Expression with resultType array of objects). </param>
-        internal MicrosoftAccessSource(string copySourceType, DataFactoryElement<int> sourceRetryCount, DataFactoryElement<string> sourceRetryWait, DataFactoryElement<int> maxConcurrentConnections, DataFactoryElement<bool> disableMetricsCollection, IDictionary<string, BinaryData> additionalProperties, DataFactoryElement<string> query, BinaryData additionalColumns) : base(copySourceType, sourceRetryCount, sourceRetryWait, maxConcurrentConnections, disableMetricsCollection, additionalProperties)
+        internal MicrosoftAccessSource(string copySourceType, DataFactoryElement<int> sourceRetryCount, DataFactoryElement<string> sourceRetryWait, DataFactoryElement<int> maxConcurrentConnections, DataFactoryElement<bool> disableMetricsCollection, IDictionary<string, DataFactoryElement<string>> additionalProperties, DataFactoryElement<string> query, BinaryData additionalColumns) : base(copySourceType, sourceRetryCount, sourceRetryWait, maxConcurrentConnections, disableMetricsCollection, additionalProperties)
         {
             Query = query;
             AdditionalColumns = additionalColumns;
diff --git a/src/AzureDataFactory.TestingFramework/Generated/Models/MicrosoftAccessTableDataset.Serialization.cs b/src/AzureDataFactory.TestingFramework/Generated/Models/MicrosoftAccessTableDataset.Serialization.cs
index 79f05e49..e29f85be 100644
--- a/src/AzureDataFactory.TestingFramework/Generated/Models/MicrosoftAccessTableDataset.Serialization.cs
+++ b/src/AzureDataFactory.TestingFramework/Generated/Models/MicrosoftAccessTableDataset.Serialization.cs
@@ -104,8 +104,8 @@ internal static MicrosoftAccessTableDataset DeserializeMicrosoftAccessTableDatas
             Optional<IList<BinaryData>> annotations = default;
             Optional<DatasetFolder> folder = default;
             Optional<DataFactoryElement<string>> tableName = default;
-            IDictionary<string, BinaryData> additionalProperties = default;
-            Dictionary<string, BinaryData> additionalPropertiesDictionary = new Dictionary<string, BinaryData>();
+            IDictionary<string, DataFactoryElement<string>> additionalProperties = default;
+            Dictionary<string, DataFactoryElement<string>> additionalPropertiesDictionary = new Dictionary<string, DataFactoryElement<string>>();
             foreach (var property in element.EnumerateObject())
             {
                 if (property.NameEquals("type"u8))
@@ -206,7 +206,7 @@ internal static MicrosoftAccessTableDataset DeserializeMicrosoftAccessTableDatas
                     }
                     continue;
                 }
-                additionalPropertiesDictionary.Add(property.Name, BinaryData.FromString(property.Value.GetRawText()));
+                additionalPropertiesDictionary.Add(property.Name, JsonSerializer.Deserialize<DataFactoryElement<string>>(property.Value.GetRawText()));
             }
             additionalProperties = additionalPropertiesDictionary;
             return new MicrosoftAccessTableDataset(type, description.Value, structure.Value, schema.Value, linkedServiceName, Optional.ToDictionary(parameters), Optional.ToList(annotations), folder.Value, additionalProperties, tableName.Value);
diff --git a/src/AzureDataFactory.TestingFramework/Generated/Models/MicrosoftAccessTableDataset.cs b/src/AzureDataFactory.TestingFramework/Generated/Models/MicrosoftAccessTableDataset.cs
index 6b55674d..8ed32d07 100644
--- a/src/AzureDataFactory.TestingFramework/Generated/Models/MicrosoftAccessTableDataset.cs
+++ b/src/AzureDataFactory.TestingFramework/Generated/Models/MicrosoftAccessTableDataset.cs
@@ -34,7 +34,7 @@ public MicrosoftAccessTableDataset(DataFactoryLinkedServiceReference linkedServi
         /// <param name="folder"> The folder that this Dataset is in. If not specified, Dataset will appear at the root level. </param>
         /// <param name="additionalProperties"> Additional Properties. </param>
         /// <param name="tableName"> The Microsoft Access table name. Type: string (or Expression with resultType string). </param>
-        internal MicrosoftAccessTableDataset(string datasetType, string description, DataFactoryElement<IList<DatasetDataElement>> structure, DataFactoryElement<IList<DatasetSchemaDataElement>> schema, DataFactoryLinkedServiceReference linkedServiceName, IDictionary<string, EntityParameterSpecification> parameters, IList<BinaryData> annotations, DatasetFolder folder, IDictionary<string, BinaryData> additionalProperties, DataFactoryElement<string> tableName) : base(datasetType, description, structure, schema, linkedServiceName, parameters, annotations, folder, additionalProperties)
+        internal MicrosoftAccessTableDataset(string datasetType, string description, DataFactoryElement<IList<DatasetDataElement>> structure, DataFactoryElement<IList<DatasetSchemaDataElement>> schema, DataFactoryLinkedServiceReference linkedServiceName, IDictionary<string, EntityParameterSpecification> parameters, IList<BinaryData> annotations, DatasetFolder folder, IDictionary<string, DataFactoryElement<string>> additionalProperties, DataFactoryElement<string> tableName) : base(datasetType, description, structure, schema, linkedServiceName, parameters, annotations, folder, additionalProperties)
         {
             TableName = tableName;
             DatasetType = datasetType ?? "MicrosoftAccessTable";
diff --git a/src/AzureDataFactory.TestingFramework/Generated/Models/MongoDBAtlasCollectionDataset.Serialization.cs b/src/AzureDataFactory.TestingFramework/Generated/Models/MongoDBAtlasCollectionDataset.Serialization.cs
index b29e55f8..1f6dd9bc 100644
--- a/src/AzureDataFactory.TestingFramework/Generated/Models/MongoDBAtlasCollectionDataset.Serialization.cs
+++ b/src/AzureDataFactory.TestingFramework/Generated/Models/MongoDBAtlasCollectionDataset.Serialization.cs
@@ -101,8 +101,8 @@ internal static MongoDBAtlasCollectionDataset DeserializeMongoDBAtlasCollectionD
             Optional<IList<BinaryData>> annotations = default;
             Optional<DatasetFolder> folder = default;
             DataFactoryElement<string> collection = default;
-            IDictionary<string, BinaryData> additionalProperties = default;
-            Dictionary<string, BinaryData> additionalPropertiesDictionary = new Dictionary<string, BinaryData>();
+            IDictionary<string, DataFactoryElement<string>> additionalProperties = default;
+            Dictionary<string, DataFactoryElement<string>> additionalPropertiesDictionary = new Dictionary<string, DataFactoryElement<string>>();
             foreach (var property in element.EnumerateObject())
             {
                 if (property.NameEquals("type"u8))
@@ -199,7 +199,7 @@ internal static MongoDBAtlasCollectionDataset DeserializeMongoDBAtlasCollectionD
                     }
                     continue;
                 }
-                additionalPropertiesDictionary.Add(property.Name, BinaryData.FromString(property.Value.GetRawText()));
+                additionalPropertiesDictionary.Add(property.Name, JsonSerializer.Deserialize<DataFactoryElement<string>>(property.Value.GetRawText()));
             }
             additionalProperties = additionalPropertiesDictionary;
             return new MongoDBAtlasCollectionDataset(type, description.Value, structure.Value, schema.Value, linkedServiceName, Optional.ToDictionary(parameters), Optional.ToList(annotations), folder.Value, additionalProperties, collection);
diff --git a/src/AzureDataFactory.TestingFramework/Generated/Models/MongoDBAtlasCollectionDataset.cs b/src/AzureDataFactory.TestingFramework/Generated/Models/MongoDBAtlasCollectionDataset.cs
index e3333111..cf62a054 100644
--- a/src/AzureDataFactory.TestingFramework/Generated/Models/MongoDBAtlasCollectionDataset.cs
+++ b/src/AzureDataFactory.TestingFramework/Generated/Models/MongoDBAtlasCollectionDataset.cs
@@ -37,7 +37,7 @@ public MongoDBAtlasCollectionDataset(DataFactoryLinkedServiceReference linkedSer
         /// <param name="folder"> The folder that this Dataset is in. If not specified, Dataset will appear at the root level. </param>
         /// <param name="additionalProperties"> Additional Properties. </param>
         /// <param name="collection"> The collection name of the MongoDB Atlas database. Type: string (or Expression with resultType string). </param>
-        internal MongoDBAtlasCollectionDataset(string datasetType, string description, DataFactoryElement<IList<DatasetDataElement>> structure, DataFactoryElement<IList<DatasetSchemaDataElement>> schema, DataFactoryLinkedServiceReference linkedServiceName, IDictionary<string, EntityParameterSpecification> parameters, IList<BinaryData> annotations, DatasetFolder folder, IDictionary<string, BinaryData> additionalProperties, DataFactoryElement<string> collection) : base(datasetType, description, structure, schema, linkedServiceName, parameters, annotations, folder, additionalProperties)
+        internal MongoDBAtlasCollectionDataset(string datasetType, string description, DataFactoryElement<IList<DatasetDataElement>> structure, DataFactoryElement<IList<DatasetSchemaDataElement>> schema, DataFactoryLinkedServiceReference linkedServiceName, IDictionary<string, EntityParameterSpecification> parameters, IList<BinaryData> annotations, DatasetFolder folder, IDictionary<string, DataFactoryElement<string>> additionalProperties, DataFactoryElement<string> collection) : base(datasetType, description, structure, schema, linkedServiceName, parameters, annotations, folder, additionalProperties)
         {
             Collection = collection;
             DatasetType = datasetType ?? "MongoDbAtlasCollection";
diff --git a/src/AzureDataFactory.TestingFramework/Generated/Models/MongoDBAtlasLinkedService.Serialization.cs b/src/AzureDataFactory.TestingFramework/Generated/Models/MongoDBAtlasLinkedService.Serialization.cs
index 9e4835a1..e7333d57 100644
--- a/src/AzureDataFactory.TestingFramework/Generated/Models/MongoDBAtlasLinkedService.Serialization.cs
+++ b/src/AzureDataFactory.TestingFramework/Generated/Models/MongoDBAtlasLinkedService.Serialization.cs
@@ -96,8 +96,8 @@ internal static MongoDBAtlasLinkedService DeserializeMongoDBAtlasLinkedService(J
             DataFactoryElement<string> connectionString = default;
             DataFactoryElement<string> database = default;
             Optional<DataFactoryElement<string>> driverVersion = default;
-            IDictionary<string, BinaryData> additionalProperties = default;
-            Dictionary<string, BinaryData> additionalPropertiesDictionary = new Dictionary<string, BinaryData>();
+            IDictionary<string, DataFactoryElement<string>> additionalProperties = default;
+            Dictionary<string, DataFactoryElement<string>> additionalPropertiesDictionary = new Dictionary<string, DataFactoryElement<string>>();
             foreach (var property in element.EnumerateObject())
             {
                 if (property.NameEquals("type"u8))
@@ -185,7 +185,7 @@ internal static MongoDBAtlasLinkedService DeserializeMongoDBAtlasLinkedService(J
                     }
                     continue;
                 }
-                additionalPropertiesDictionary.Add(property.Name, BinaryData.FromString(property.Value.GetRawText()));
+                additionalPropertiesDictionary.Add(property.Name, JsonSerializer.Deserialize<DataFactoryElement<string>>(property.Value.GetRawText()));
             }
             additionalProperties = additionalPropertiesDictionary;
             return new MongoDBAtlasLinkedService(type, connectVia.Value, description.Value, Optional.ToDictionary(parameters), Optional.ToList(annotations), additionalProperties, connectionString, database, driverVersion.Value);
diff --git a/src/AzureDataFactory.TestingFramework/Generated/Models/MongoDBAtlasLinkedService.cs b/src/AzureDataFactory.TestingFramework/Generated/Models/MongoDBAtlasLinkedService.cs
index 79d12f0e..e51ee747 100644
--- a/src/AzureDataFactory.TestingFramework/Generated/Models/MongoDBAtlasLinkedService.cs
+++ b/src/AzureDataFactory.TestingFramework/Generated/Models/MongoDBAtlasLinkedService.cs
@@ -37,7 +37,7 @@ public MongoDBAtlasLinkedService(DataFactoryElement<string> connectionString, Da
         /// <param name="connectionString"> The MongoDB Atlas connection string. Type: string, SecureString or AzureKeyVaultSecretReference. Type: string, SecureString or AzureKeyVaultSecretReference. </param>
         /// <param name="database"> The name of the MongoDB Atlas database that you want to access. Type: string (or Expression with resultType string). </param>
         /// <param name="driverVersion"> The driver version that you want to choose. Allowed value are v1 and v2. Type: string (or Expression with resultType string). </param>
-        internal MongoDBAtlasLinkedService(string linkedServiceType, IntegrationRuntimeReference connectVia, string description, IDictionary<string, EntityParameterSpecification> parameters, IList<BinaryData> annotations, IDictionary<string, BinaryData> additionalProperties, DataFactoryElement<string> connectionString, DataFactoryElement<string> database, DataFactoryElement<string> driverVersion) : base(linkedServiceType, connectVia, description, parameters, annotations, additionalProperties)
+        internal MongoDBAtlasLinkedService(string linkedServiceType, IntegrationRuntimeReference connectVia, string description, IDictionary<string, EntityParameterSpecification> parameters, IList<BinaryData> annotations, IDictionary<string, DataFactoryElement<string>> additionalProperties, DataFactoryElement<string> connectionString, DataFactoryElement<string> database, DataFactoryElement<string> driverVersion) : base(linkedServiceType, connectVia, description, parameters, annotations, additionalProperties)
         {
             ConnectionString = connectionString;
             Database = database;
diff --git a/src/AzureDataFactory.TestingFramework/Generated/Models/MongoDBAtlasSink.Serialization.cs b/src/AzureDataFactory.TestingFramework/Generated/Models/MongoDBAtlasSink.Serialization.cs
index ee8d1bf5..2be67e0c 100644
--- a/src/AzureDataFactory.TestingFramework/Generated/Models/MongoDBAtlasSink.Serialization.cs
+++ b/src/AzureDataFactory.TestingFramework/Generated/Models/MongoDBAtlasSink.Serialization.cs
@@ -79,8 +79,8 @@ internal static MongoDBAtlasSink DeserializeMongoDBAtlasSink(JsonElement element
             Optional<DataFactoryElement<string>> sinkRetryWait = default;
             Optional<DataFactoryElement<int>> maxConcurrentConnections = default;
             Optional<DataFactoryElement<bool>> disableMetricsCollection = default;
-            IDictionary<string, BinaryData> additionalProperties = default;
-            Dictionary<string, BinaryData> additionalPropertiesDictionary = new Dictionary<string, BinaryData>();
+            IDictionary<string, DataFactoryElement<string>> additionalProperties = default;
+            Dictionary<string, DataFactoryElement<string>> additionalPropertiesDictionary = new Dictionary<string, DataFactoryElement<string>>();
             foreach (var property in element.EnumerateObject())
             {
                 if (property.NameEquals("writeBehavior"u8))
@@ -151,7 +151,7 @@ internal static MongoDBAtlasSink DeserializeMongoDBAtlasSink(JsonElement element
                     disableMetricsCollection = JsonSerializer.Deserialize<DataFactoryElement<bool>>(property.Value.GetRawText());
                     continue;
                 }
-                additionalPropertiesDictionary.Add(property.Name, BinaryData.FromString(property.Value.GetRawText()));
+                additionalPropertiesDictionary.Add(property.Name, JsonSerializer.Deserialize<DataFactoryElement<string>>(property.Value.GetRawText()));
             }
             additionalProperties = additionalPropertiesDictionary;
             return new MongoDBAtlasSink(type, writeBatchSize.Value, writeBatchTimeout.Value, sinkRetryCount.Value, sinkRetryWait.Value, maxConcurrentConnections.Value, disableMetricsCollection.Value, additionalProperties, writeBehavior.Value);
diff --git a/src/AzureDataFactory.TestingFramework/Generated/Models/MongoDBAtlasSink.cs b/src/AzureDataFactory.TestingFramework/Generated/Models/MongoDBAtlasSink.cs
index e244881e..01c6b604 100644
--- a/src/AzureDataFactory.TestingFramework/Generated/Models/MongoDBAtlasSink.cs
+++ b/src/AzureDataFactory.TestingFramework/Generated/Models/MongoDBAtlasSink.cs
@@ -28,7 +28,7 @@ public MongoDBAtlasSink()
         /// <param name="disableMetricsCollection"> If true, disable data store metrics collection. Default is false. Type: boolean (or Expression with resultType boolean). </param>
         /// <param name="additionalProperties"> Additional Properties. </param>
         /// <param name="writeBehavior"> Specifies whether the document with same key to be overwritten (upsert) rather than throw exception (insert). The default value is "insert". Type: string (or Expression with resultType string). Type: string (or Expression with resultType string). </param>
-        internal MongoDBAtlasSink(string copySinkType, DataFactoryElement<int> writeBatchSize, DataFactoryElement<string> writeBatchTimeout, DataFactoryElement<int> sinkRetryCount, DataFactoryElement<string> sinkRetryWait, DataFactoryElement<int> maxConcurrentConnections, DataFactoryElement<bool> disableMetricsCollection, IDictionary<string, BinaryData> additionalProperties, DataFactoryElement<string> writeBehavior) : base(copySinkType, writeBatchSize, writeBatchTimeout, sinkRetryCount, sinkRetryWait, maxConcurrentConnections, disableMetricsCollection, additionalProperties)
+        internal MongoDBAtlasSink(string copySinkType, DataFactoryElement<int> writeBatchSize, DataFactoryElement<string> writeBatchTimeout, DataFactoryElement<int> sinkRetryCount, DataFactoryElement<string> sinkRetryWait, DataFactoryElement<int> maxConcurrentConnections, DataFactoryElement<bool> disableMetricsCollection, IDictionary<string, DataFactoryElement<string>> additionalProperties, DataFactoryElement<string> writeBehavior) : base(copySinkType, writeBatchSize, writeBatchTimeout, sinkRetryCount, sinkRetryWait, maxConcurrentConnections, disableMetricsCollection, additionalProperties)
         {
             WriteBehavior = writeBehavior;
             CopySinkType = copySinkType ?? "MongoDbAtlasSink";
diff --git a/src/AzureDataFactory.TestingFramework/Generated/Models/MongoDBAtlasSource.Serialization.cs b/src/AzureDataFactory.TestingFramework/Generated/Models/MongoDBAtlasSource.Serialization.cs
index 2cf11024..9d245049 100644
--- a/src/AzureDataFactory.TestingFramework/Generated/Models/MongoDBAtlasSource.Serialization.cs
+++ b/src/AzureDataFactory.TestingFramework/Generated/Models/MongoDBAtlasSource.Serialization.cs
@@ -95,8 +95,8 @@ internal static MongoDBAtlasSource DeserializeMongoDBAtlasSource(JsonElement ele
             Optional<DataFactoryElement<string>> sourceRetryWait = default;
             Optional<DataFactoryElement<int>> maxConcurrentConnections = default;
             Optional<DataFactoryElement<bool>> disableMetricsCollection = default;
-            IDictionary<string, BinaryData> additionalProperties = default;
-            Dictionary<string, BinaryData> additionalPropertiesDictionary = new Dictionary<string, BinaryData>();
+            IDictionary<string, DataFactoryElement<string>> additionalProperties = default;
+            Dictionary<string, DataFactoryElement<string>> additionalPropertiesDictionary = new Dictionary<string, DataFactoryElement<string>>();
             foreach (var property in element.EnumerateObject())
             {
                 if (property.NameEquals("filter"u8))
@@ -185,7 +185,7 @@ internal static MongoDBAtlasSource DeserializeMongoDBAtlasSource(JsonElement ele
                     disableMetricsCollection = JsonSerializer.Deserialize<DataFactoryElement<bool>>(property.Value.GetRawText());
                     continue;
                 }
-                additionalPropertiesDictionary.Add(property.Name, BinaryData.FromString(property.Value.GetRawText()));
+                additionalPropertiesDictionary.Add(property.Name, JsonSerializer.Deserialize<DataFactoryElement<string>>(property.Value.GetRawText()));
             }
             additionalProperties = additionalPropertiesDictionary;
             return new MongoDBAtlasSource(type, sourceRetryCount.Value, sourceRetryWait.Value, maxConcurrentConnections.Value, disableMetricsCollection.Value, additionalProperties, filter.Value, cursorMethods.Value, batchSize.Value, queryTimeout.Value, additionalColumns.Value);
diff --git a/src/AzureDataFactory.TestingFramework/Generated/Models/MongoDBAtlasSource.cs b/src/AzureDataFactory.TestingFramework/Generated/Models/MongoDBAtlasSource.cs
index b9fcb39a..45d78b06 100644
--- a/src/AzureDataFactory.TestingFramework/Generated/Models/MongoDBAtlasSource.cs
+++ b/src/AzureDataFactory.TestingFramework/Generated/Models/MongoDBAtlasSource.cs
@@ -30,7 +30,7 @@ public MongoDBAtlasSource()
         /// <param name="batchSize"> Specifies the number of documents to return in each batch of the response from MongoDB Atlas instance. In most cases, modifying the batch size will not affect the user or the application. This property's main purpose is to avoid hit the limitation of response size. Type: integer (or Expression with resultType integer). </param>
         /// <param name="queryTimeout"> Query timeout. Type: string (or Expression with resultType string), pattern: ((\d+)\.)?(\d\d):(60|([0-5][0-9])):(60|([0-5][0-9])). </param>
         /// <param name="additionalColumns"> Specifies the additional columns to be added to source data. Type: array of objects(AdditionalColumns) (or Expression with resultType array of objects). </param>
-        internal MongoDBAtlasSource(string copySourceType, DataFactoryElement<int> sourceRetryCount, DataFactoryElement<string> sourceRetryWait, DataFactoryElement<int> maxConcurrentConnections, DataFactoryElement<bool> disableMetricsCollection, IDictionary<string, BinaryData> additionalProperties, DataFactoryElement<string> filter, MongoDBCursorMethodsProperties cursorMethods, DataFactoryElement<int> batchSize, DataFactoryElement<string> queryTimeout, BinaryData additionalColumns) : base(copySourceType, sourceRetryCount, sourceRetryWait, maxConcurrentConnections, disableMetricsCollection, additionalProperties)
+        internal MongoDBAtlasSource(string copySourceType, DataFactoryElement<int> sourceRetryCount, DataFactoryElement<string> sourceRetryWait, DataFactoryElement<int> maxConcurrentConnections, DataFactoryElement<bool> disableMetricsCollection, IDictionary<string, DataFactoryElement<string>> additionalProperties, DataFactoryElement<string> filter, MongoDBCursorMethodsProperties cursorMethods, DataFactoryElement<int> batchSize, DataFactoryElement<string> queryTimeout, BinaryData additionalColumns) : base(copySourceType, sourceRetryCount, sourceRetryWait, maxConcurrentConnections, disableMetricsCollection, additionalProperties)
         {
             Filter = filter;
             CursorMethods = cursorMethods;
diff --git a/src/AzureDataFactory.TestingFramework/Generated/Models/MongoDBCollectionDataset.Serialization.cs b/src/AzureDataFactory.TestingFramework/Generated/Models/MongoDBCollectionDataset.Serialization.cs
index 9255af5e..80dbb3a1 100644
--- a/src/AzureDataFactory.TestingFramework/Generated/Models/MongoDBCollectionDataset.Serialization.cs
+++ b/src/AzureDataFactory.TestingFramework/Generated/Models/MongoDBCollectionDataset.Serialization.cs
@@ -101,8 +101,8 @@ internal static MongoDBCollectionDataset DeserializeMongoDBCollectionDataset(Jso
             Optional<IList<BinaryData>> annotations = default;
             Optional<DatasetFolder> folder = default;
             DataFactoryElement<string> collectionName = default;
-            IDictionary<string, BinaryData> additionalProperties = default;
-            Dictionary<string, BinaryData> additionalPropertiesDictionary = new Dictionary<string, BinaryData>();
+            IDictionary<string, DataFactoryElement<string>> additionalProperties = default;
+            Dictionary<string, DataFactoryElement<string>> additionalPropertiesDictionary = new Dictionary<string, DataFactoryElement<string>>();
             foreach (var property in element.EnumerateObject())
             {
                 if (property.NameEquals("type"u8))
@@ -199,7 +199,7 @@ internal static MongoDBCollectionDataset DeserializeMongoDBCollectionDataset(Jso
                     }
                     continue;
                 }
-                additionalPropertiesDictionary.Add(property.Name, BinaryData.FromString(property.Value.GetRawText()));
+                additionalPropertiesDictionary.Add(property.Name, JsonSerializer.Deserialize<DataFactoryElement<string>>(property.Value.GetRawText()));
             }
             additionalProperties = additionalPropertiesDictionary;
             return new MongoDBCollectionDataset(type, description.Value, structure.Value, schema.Value, linkedServiceName, Optional.ToDictionary(parameters), Optional.ToList(annotations), folder.Value, additionalProperties, collectionName);
diff --git a/src/AzureDataFactory.TestingFramework/Generated/Models/MongoDBCollectionDataset.cs b/src/AzureDataFactory.TestingFramework/Generated/Models/MongoDBCollectionDataset.cs
index 629b34e6..886f5912 100644
--- a/src/AzureDataFactory.TestingFramework/Generated/Models/MongoDBCollectionDataset.cs
+++ b/src/AzureDataFactory.TestingFramework/Generated/Models/MongoDBCollectionDataset.cs
@@ -37,7 +37,7 @@ public MongoDBCollectionDataset(DataFactoryLinkedServiceReference linkedServiceN
         /// <param name="folder"> The folder that this Dataset is in. If not specified, Dataset will appear at the root level. </param>
         /// <param name="additionalProperties"> Additional Properties. </param>
         /// <param name="collectionName"> The table name of the MongoDB database. Type: string (or Expression with resultType string). </param>
-        internal MongoDBCollectionDataset(string datasetType, string description, DataFactoryElement<IList<DatasetDataElement>> structure, DataFactoryElement<IList<DatasetSchemaDataElement>> schema, DataFactoryLinkedServiceReference linkedServiceName, IDictionary<string, EntityParameterSpecification> parameters, IList<BinaryData> annotations, DatasetFolder folder, IDictionary<string, BinaryData> additionalProperties, DataFactoryElement<string> collectionName) : base(datasetType, description, structure, schema, linkedServiceName, parameters, annotations, folder, additionalProperties)
+        internal MongoDBCollectionDataset(string datasetType, string description, DataFactoryElement<IList<DatasetDataElement>> structure, DataFactoryElement<IList<DatasetSchemaDataElement>> schema, DataFactoryLinkedServiceReference linkedServiceName, IDictionary<string, EntityParameterSpecification> parameters, IList<BinaryData> annotations, DatasetFolder folder, IDictionary<string, DataFactoryElement<string>> additionalProperties, DataFactoryElement<string> collectionName) : base(datasetType, description, structure, schema, linkedServiceName, parameters, annotations, folder, additionalProperties)
         {
             CollectionName = collectionName;
             DatasetType = datasetType ?? "MongoDbCollection";
diff --git a/src/AzureDataFactory.TestingFramework/Generated/Models/MongoDBCursorMethodsProperties.Serialization.cs b/src/AzureDataFactory.TestingFramework/Generated/Models/MongoDBCursorMethodsProperties.Serialization.cs
index 673c327d..5bad6917 100644
--- a/src/AzureDataFactory.TestingFramework/Generated/Models/MongoDBCursorMethodsProperties.Serialization.cs
+++ b/src/AzureDataFactory.TestingFramework/Generated/Models/MongoDBCursorMethodsProperties.Serialization.cs
@@ -58,8 +58,8 @@ internal static MongoDBCursorMethodsProperties DeserializeMongoDBCursorMethodsPr
             Optional<DataFactoryElement<string>> sort = default;
             Optional<DataFactoryElement<int>> skip = default;
             Optional<DataFactoryElement<int>> limit = default;
-            IDictionary<string, BinaryData> additionalProperties = default;
-            Dictionary<string, BinaryData> additionalPropertiesDictionary = new Dictionary<string, BinaryData>();
+            IDictionary<string, DataFactoryElement<string>> additionalProperties = default;
+            Dictionary<string, DataFactoryElement<string>> additionalPropertiesDictionary = new Dictionary<string, DataFactoryElement<string>>();
             foreach (var property in element.EnumerateObject())
             {
                 if (property.NameEquals("project"u8))
@@ -98,7 +98,7 @@ internal static MongoDBCursorMethodsProperties DeserializeMongoDBCursorMethodsPr
                     limit = JsonSerializer.Deserialize<DataFactoryElement<int>>(property.Value.GetRawText());
                     continue;
                 }
-                additionalPropertiesDictionary.Add(property.Name, BinaryData.FromString(property.Value.GetRawText()));
+                additionalPropertiesDictionary.Add(property.Name, JsonSerializer.Deserialize<DataFactoryElement<string>>(property.Value.GetRawText()));
             }
             additionalProperties = additionalPropertiesDictionary;
             return new MongoDBCursorMethodsProperties(project.Value, sort.Value, skip.Value, limit.Value, additionalProperties);
diff --git a/src/AzureDataFactory.TestingFramework/Generated/Models/MongoDBCursorMethodsProperties.cs b/src/AzureDataFactory.TestingFramework/Generated/Models/MongoDBCursorMethodsProperties.cs
index acd1e1b8..20671595 100644
--- a/src/AzureDataFactory.TestingFramework/Generated/Models/MongoDBCursorMethodsProperties.cs
+++ b/src/AzureDataFactory.TestingFramework/Generated/Models/MongoDBCursorMethodsProperties.cs
@@ -16,7 +16,7 @@ public partial class MongoDBCursorMethodsProperties
         /// <summary> Initializes a new instance of MongoDBCursorMethodsProperties. </summary>
         public MongoDBCursorMethodsProperties()
         {
-            AdditionalProperties = new ChangeTrackingDictionary<string, BinaryData>();
+            AdditionalProperties = new ChangeTrackingDictionary<string, DataFactoryElement<string>>();
         }
 
         /// <summary> Initializes a new instance of MongoDBCursorMethodsProperties. </summary>
@@ -25,7 +25,7 @@ public MongoDBCursorMethodsProperties()
         /// <param name="skip"> Specifies the how many documents skipped and where MongoDB begins returning results. This approach may be useful in implementing paginated results. Type: integer (or Expression with resultType integer). </param>
         /// <param name="limit"> Specifies the maximum number of documents the server returns. limit() is analogous to the LIMIT statement in a SQL database. Type: integer (or Expression with resultType integer). </param>
         /// <param name="additionalProperties"> Additional Properties. </param>
-        internal MongoDBCursorMethodsProperties(DataFactoryElement<string> project, DataFactoryElement<string> sort, DataFactoryElement<int> skip, DataFactoryElement<int> limit, IDictionary<string, BinaryData> additionalProperties)
+        internal MongoDBCursorMethodsProperties(DataFactoryElement<string> project, DataFactoryElement<string> sort, DataFactoryElement<int> skip, DataFactoryElement<int> limit, IDictionary<string, DataFactoryElement<string>> additionalProperties)
         {
             Project = project;
             Sort = sort;
@@ -72,6 +72,6 @@ internal MongoDBCursorMethodsProperties(DataFactoryElement<string> project, Data
         /// </list>
         /// </para>
         /// </summary>
-        public IDictionary<string, BinaryData> AdditionalProperties { get; }
+        public IDictionary<string, DataFactoryElement<string>> AdditionalProperties { get; }
     }
 }
diff --git a/src/AzureDataFactory.TestingFramework/Generated/Models/MongoDBLinkedService.Serialization.cs b/src/AzureDataFactory.TestingFramework/Generated/Models/MongoDBLinkedService.Serialization.cs
index 78a656e3..b1f32689 100644
--- a/src/AzureDataFactory.TestingFramework/Generated/Models/MongoDBLinkedService.Serialization.cs
+++ b/src/AzureDataFactory.TestingFramework/Generated/Models/MongoDBLinkedService.Serialization.cs
@@ -138,8 +138,8 @@ internal static MongoDBLinkedService DeserializeMongoDBLinkedService(JsonElement
             Optional<DataFactoryElement<bool>> enableSsl = default;
             Optional<DataFactoryElement<bool>> allowSelfSignedServerCert = default;
             Optional<string> encryptedCredential = default;
-            IDictionary<string, BinaryData> additionalProperties = default;
-            Dictionary<string, BinaryData> additionalPropertiesDictionary = new Dictionary<string, BinaryData>();
+            IDictionary<string, DataFactoryElement<string>> additionalProperties = default;
+            Dictionary<string, DataFactoryElement<string>> additionalPropertiesDictionary = new Dictionary<string, DataFactoryElement<string>>();
             foreach (var property in element.EnumerateObject())
             {
                 if (property.NameEquals("type"u8))
@@ -286,7 +286,7 @@ internal static MongoDBLinkedService DeserializeMongoDBLinkedService(JsonElement
                     }
                     continue;
                 }
-                additionalPropertiesDictionary.Add(property.Name, BinaryData.FromString(property.Value.GetRawText()));
+                additionalPropertiesDictionary.Add(property.Name, JsonSerializer.Deserialize<DataFactoryElement<string>>(property.Value.GetRawText()));
             }
             additionalProperties = additionalPropertiesDictionary;
             return new MongoDBLinkedService(type, connectVia.Value, description.Value, Optional.ToDictionary(parameters), Optional.ToList(annotations), additionalProperties, server, Optional.ToNullable(authenticationType), databaseName, username.Value, password, authSource.Value, port.Value, enableSsl.Value, allowSelfSignedServerCert.Value, encryptedCredential.Value);
diff --git a/src/AzureDataFactory.TestingFramework/Generated/Models/MongoDBLinkedService.cs b/src/AzureDataFactory.TestingFramework/Generated/Models/MongoDBLinkedService.cs
index f88055c3..2ec72dd4 100644
--- a/src/AzureDataFactory.TestingFramework/Generated/Models/MongoDBLinkedService.cs
+++ b/src/AzureDataFactory.TestingFramework/Generated/Models/MongoDBLinkedService.cs
@@ -44,7 +44,7 @@ public MongoDBLinkedService(DataFactoryElement<string> server, DataFactoryElemen
         /// <param name="enableSsl"> Specifies whether the connections to the server are encrypted using SSL. The default value is false. Type: boolean (or Expression with resultType boolean). </param>
         /// <param name="allowSelfSignedServerCert"> Specifies whether to allow self-signed certificates from the server. The default value is false. Type: boolean (or Expression with resultType boolean). </param>
         /// <param name="encryptedCredential"> The encrypted credential used for authentication. Credentials are encrypted using the integration runtime credential manager. Type: string. </param>
-        internal MongoDBLinkedService(string linkedServiceType, IntegrationRuntimeReference connectVia, string description, IDictionary<string, EntityParameterSpecification> parameters, IList<BinaryData> annotations, IDictionary<string, BinaryData> additionalProperties, DataFactoryElement<string> server, MongoDBAuthenticationType? authenticationType, DataFactoryElement<string> databaseName, DataFactoryElement<string> username, DataFactorySecretBaseDefinition password, DataFactoryElement<string> authSource, DataFactoryElement<int> port, DataFactoryElement<bool> enableSsl, DataFactoryElement<bool> allowSelfSignedServerCert, string encryptedCredential) : base(linkedServiceType, connectVia, description, parameters, annotations, additionalProperties)
+        internal MongoDBLinkedService(string linkedServiceType, IntegrationRuntimeReference connectVia, string description, IDictionary<string, EntityParameterSpecification> parameters, IList<BinaryData> annotations, IDictionary<string, DataFactoryElement<string>> additionalProperties, DataFactoryElement<string> server, MongoDBAuthenticationType? authenticationType, DataFactoryElement<string> databaseName, DataFactoryElement<string> username, DataFactorySecretBaseDefinition password, DataFactoryElement<string> authSource, DataFactoryElement<int> port, DataFactoryElement<bool> enableSsl, DataFactoryElement<bool> allowSelfSignedServerCert, string encryptedCredential) : base(linkedServiceType, connectVia, description, parameters, annotations, additionalProperties)
         {
             Server = server;
             AuthenticationType = authenticationType;
diff --git a/src/AzureDataFactory.TestingFramework/Generated/Models/MongoDBSource.Serialization.cs b/src/AzureDataFactory.TestingFramework/Generated/Models/MongoDBSource.Serialization.cs
index 925be821..cd2a5b9c 100644
--- a/src/AzureDataFactory.TestingFramework/Generated/Models/MongoDBSource.Serialization.cs
+++ b/src/AzureDataFactory.TestingFramework/Generated/Models/MongoDBSource.Serialization.cs
@@ -77,8 +77,8 @@ internal static MongoDBSource DeserializeMongoDBSource(JsonElement element)
             Optional<DataFactoryElement<string>> sourceRetryWait = default;
             Optional<DataFactoryElement<int>> maxConcurrentConnections = default;
             Optional<DataFactoryElement<bool>> disableMetricsCollection = default;
-            IDictionary<string, BinaryData> additionalProperties = default;
-            Dictionary<string, BinaryData> additionalPropertiesDictionary = new Dictionary<string, BinaryData>();
+            IDictionary<string, DataFactoryElement<string>> additionalProperties = default;
+            Dictionary<string, DataFactoryElement<string>> additionalPropertiesDictionary = new Dictionary<string, DataFactoryElement<string>>();
             foreach (var property in element.EnumerateObject())
             {
                 if (property.NameEquals("query"u8))
@@ -140,7 +140,7 @@ internal static MongoDBSource DeserializeMongoDBSource(JsonElement element)
                     disableMetricsCollection = JsonSerializer.Deserialize<DataFactoryElement<bool>>(property.Value.GetRawText());
                     continue;
                 }
-                additionalPropertiesDictionary.Add(property.Name, BinaryData.FromString(property.Value.GetRawText()));
+                additionalPropertiesDictionary.Add(property.Name, JsonSerializer.Deserialize<DataFactoryElement<string>>(property.Value.GetRawText()));
             }
             additionalProperties = additionalPropertiesDictionary;
             return new MongoDBSource(type, sourceRetryCount.Value, sourceRetryWait.Value, maxConcurrentConnections.Value, disableMetricsCollection.Value, additionalProperties, query.Value, additionalColumns.Value);
diff --git a/src/AzureDataFactory.TestingFramework/Generated/Models/MongoDBSource.cs b/src/AzureDataFactory.TestingFramework/Generated/Models/MongoDBSource.cs
index 90a01d82..734282ed 100644
--- a/src/AzureDataFactory.TestingFramework/Generated/Models/MongoDBSource.cs
+++ b/src/AzureDataFactory.TestingFramework/Generated/Models/MongoDBSource.cs
@@ -27,7 +27,7 @@ public MongoDBSource()
         /// <param name="additionalProperties"> Additional Properties. </param>
         /// <param name="query"> Database query. Should be a SQL-92 query expression. Type: string (or Expression with resultType string). </param>
         /// <param name="additionalColumns"> Specifies the additional columns to be added to source data. Type: array of objects(AdditionalColumns) (or Expression with resultType array of objects). </param>
-        internal MongoDBSource(string copySourceType, DataFactoryElement<int> sourceRetryCount, DataFactoryElement<string> sourceRetryWait, DataFactoryElement<int> maxConcurrentConnections, DataFactoryElement<bool> disableMetricsCollection, IDictionary<string, BinaryData> additionalProperties, DataFactoryElement<string> query, BinaryData additionalColumns) : base(copySourceType, sourceRetryCount, sourceRetryWait, maxConcurrentConnections, disableMetricsCollection, additionalProperties)
+        internal MongoDBSource(string copySourceType, DataFactoryElement<int> sourceRetryCount, DataFactoryElement<string> sourceRetryWait, DataFactoryElement<int> maxConcurrentConnections, DataFactoryElement<bool> disableMetricsCollection, IDictionary<string, DataFactoryElement<string>> additionalProperties, DataFactoryElement<string> query, BinaryData additionalColumns) : base(copySourceType, sourceRetryCount, sourceRetryWait, maxConcurrentConnections, disableMetricsCollection, additionalProperties)
         {
             Query = query;
             AdditionalColumns = additionalColumns;
diff --git a/src/AzureDataFactory.TestingFramework/Generated/Models/MongoDBV2CollectionDataset.Serialization.cs b/src/AzureDataFactory.TestingFramework/Generated/Models/MongoDBV2CollectionDataset.Serialization.cs
index ae57c3f4..253f8769 100644
--- a/src/AzureDataFactory.TestingFramework/Generated/Models/MongoDBV2CollectionDataset.Serialization.cs
+++ b/src/AzureDataFactory.TestingFramework/Generated/Models/MongoDBV2CollectionDataset.Serialization.cs
@@ -101,8 +101,8 @@ internal static MongoDBV2CollectionDataset DeserializeMongoDBV2CollectionDataset
             Optional<IList<BinaryData>> annotations = default;
             Optional<DatasetFolder> folder = default;
             DataFactoryElement<string> collection = default;
-            IDictionary<string, BinaryData> additionalProperties = default;
-            Dictionary<string, BinaryData> additionalPropertiesDictionary = new Dictionary<string, BinaryData>();
+            IDictionary<string, DataFactoryElement<string>> additionalProperties = default;
+            Dictionary<string, DataFactoryElement<string>> additionalPropertiesDictionary = new Dictionary<string, DataFactoryElement<string>>();
             foreach (var property in element.EnumerateObject())
             {
                 if (property.NameEquals("type"u8))
@@ -199,7 +199,7 @@ internal static MongoDBV2CollectionDataset DeserializeMongoDBV2CollectionDataset
                     }
                     continue;
                 }
-                additionalPropertiesDictionary.Add(property.Name, BinaryData.FromString(property.Value.GetRawText()));
+                additionalPropertiesDictionary.Add(property.Name, JsonSerializer.Deserialize<DataFactoryElement<string>>(property.Value.GetRawText()));
             }
             additionalProperties = additionalPropertiesDictionary;
             return new MongoDBV2CollectionDataset(type, description.Value, structure.Value, schema.Value, linkedServiceName, Optional.ToDictionary(parameters), Optional.ToList(annotations), folder.Value, additionalProperties, collection);
diff --git a/src/AzureDataFactory.TestingFramework/Generated/Models/MongoDBV2CollectionDataset.cs b/src/AzureDataFactory.TestingFramework/Generated/Models/MongoDBV2CollectionDataset.cs
index fd569294..f14c87d4 100644
--- a/src/AzureDataFactory.TestingFramework/Generated/Models/MongoDBV2CollectionDataset.cs
+++ b/src/AzureDataFactory.TestingFramework/Generated/Models/MongoDBV2CollectionDataset.cs
@@ -37,7 +37,7 @@ public MongoDBV2CollectionDataset(DataFactoryLinkedServiceReference linkedServic
         /// <param name="folder"> The folder that this Dataset is in. If not specified, Dataset will appear at the root level. </param>
         /// <param name="additionalProperties"> Additional Properties. </param>
         /// <param name="collection"> The collection name of the MongoDB database. Type: string (or Expression with resultType string). </param>
-        internal MongoDBV2CollectionDataset(string datasetType, string description, DataFactoryElement<IList<DatasetDataElement>> structure, DataFactoryElement<IList<DatasetSchemaDataElement>> schema, DataFactoryLinkedServiceReference linkedServiceName, IDictionary<string, EntityParameterSpecification> parameters, IList<BinaryData> annotations, DatasetFolder folder, IDictionary<string, BinaryData> additionalProperties, DataFactoryElement<string> collection) : base(datasetType, description, structure, schema, linkedServiceName, parameters, annotations, folder, additionalProperties)
+        internal MongoDBV2CollectionDataset(string datasetType, string description, DataFactoryElement<IList<DatasetDataElement>> structure, DataFactoryElement<IList<DatasetSchemaDataElement>> schema, DataFactoryLinkedServiceReference linkedServiceName, IDictionary<string, EntityParameterSpecification> parameters, IList<BinaryData> annotations, DatasetFolder folder, IDictionary<string, DataFactoryElement<string>> additionalProperties, DataFactoryElement<string> collection) : base(datasetType, description, structure, schema, linkedServiceName, parameters, annotations, folder, additionalProperties)
         {
             Collection = collection;
             DatasetType = datasetType ?? "MongoDbV2Collection";
diff --git a/src/AzureDataFactory.TestingFramework/Generated/Models/MongoDBV2LinkedService.Serialization.cs b/src/AzureDataFactory.TestingFramework/Generated/Models/MongoDBV2LinkedService.Serialization.cs
index 8938d80d..089f82c4 100644
--- a/src/AzureDataFactory.TestingFramework/Generated/Models/MongoDBV2LinkedService.Serialization.cs
+++ b/src/AzureDataFactory.TestingFramework/Generated/Models/MongoDBV2LinkedService.Serialization.cs
@@ -90,8 +90,8 @@ internal static MongoDBV2LinkedService DeserializeMongoDBV2LinkedService(JsonEle
             Optional<IList<BinaryData>> annotations = default;
             DataFactoryElement<string> connectionString = default;
             DataFactoryElement<string> database = default;
-            IDictionary<string, BinaryData> additionalProperties = default;
-            Dictionary<string, BinaryData> additionalPropertiesDictionary = new Dictionary<string, BinaryData>();
+            IDictionary<string, DataFactoryElement<string>> additionalProperties = default;
+            Dictionary<string, DataFactoryElement<string>> additionalPropertiesDictionary = new Dictionary<string, DataFactoryElement<string>>();
             foreach (var property in element.EnumerateObject())
             {
                 if (property.NameEquals("type"u8))
@@ -170,7 +170,7 @@ internal static MongoDBV2LinkedService DeserializeMongoDBV2LinkedService(JsonEle
                     }
                     continue;
                 }
-                additionalPropertiesDictionary.Add(property.Name, BinaryData.FromString(property.Value.GetRawText()));
+                additionalPropertiesDictionary.Add(property.Name, JsonSerializer.Deserialize<DataFactoryElement<string>>(property.Value.GetRawText()));
             }
             additionalProperties = additionalPropertiesDictionary;
             return new MongoDBV2LinkedService(type, connectVia.Value, description.Value, Optional.ToDictionary(parameters), Optional.ToList(annotations), additionalProperties, connectionString, database);
diff --git a/src/AzureDataFactory.TestingFramework/Generated/Models/MongoDBV2LinkedService.cs b/src/AzureDataFactory.TestingFramework/Generated/Models/MongoDBV2LinkedService.cs
index f375a0be..11c401df 100644
--- a/src/AzureDataFactory.TestingFramework/Generated/Models/MongoDBV2LinkedService.cs
+++ b/src/AzureDataFactory.TestingFramework/Generated/Models/MongoDBV2LinkedService.cs
@@ -36,7 +36,7 @@ public MongoDBV2LinkedService(DataFactoryElement<string> connectionString, DataF
         /// <param name="additionalProperties"> Additional Properties. </param>
         /// <param name="connectionString"> The MongoDB connection string. Type: string, SecureString or AzureKeyVaultSecretReference. Type: string, SecureString or AzureKeyVaultSecretReference. </param>
         /// <param name="database"> The name of the MongoDB database that you want to access. Type: string (or Expression with resultType string). </param>
-        internal MongoDBV2LinkedService(string linkedServiceType, IntegrationRuntimeReference connectVia, string description, IDictionary<string, EntityParameterSpecification> parameters, IList<BinaryData> annotations, IDictionary<string, BinaryData> additionalProperties, DataFactoryElement<string> connectionString, DataFactoryElement<string> database) : base(linkedServiceType, connectVia, description, parameters, annotations, additionalProperties)
+        internal MongoDBV2LinkedService(string linkedServiceType, IntegrationRuntimeReference connectVia, string description, IDictionary<string, EntityParameterSpecification> parameters, IList<BinaryData> annotations, IDictionary<string, DataFactoryElement<string>> additionalProperties, DataFactoryElement<string> connectionString, DataFactoryElement<string> database) : base(linkedServiceType, connectVia, description, parameters, annotations, additionalProperties)
         {
             ConnectionString = connectionString;
             Database = database;
diff --git a/src/AzureDataFactory.TestingFramework/Generated/Models/MongoDBV2Sink.Serialization.cs b/src/AzureDataFactory.TestingFramework/Generated/Models/MongoDBV2Sink.Serialization.cs
index f6c4c186..5c70b62f 100644
--- a/src/AzureDataFactory.TestingFramework/Generated/Models/MongoDBV2Sink.Serialization.cs
+++ b/src/AzureDataFactory.TestingFramework/Generated/Models/MongoDBV2Sink.Serialization.cs
@@ -79,8 +79,8 @@ internal static MongoDBV2Sink DeserializeMongoDBV2Sink(JsonElement element)
             Optional<DataFactoryElement<string>> sinkRetryWait = default;
             Optional<DataFactoryElement<int>> maxConcurrentConnections = default;
             Optional<DataFactoryElement<bool>> disableMetricsCollection = default;
-            IDictionary<string, BinaryData> additionalProperties = default;
-            Dictionary<string, BinaryData> additionalPropertiesDictionary = new Dictionary<string, BinaryData>();
+            IDictionary<string, DataFactoryElement<string>> additionalProperties = default;
+            Dictionary<string, DataFactoryElement<string>> additionalPropertiesDictionary = new Dictionary<string, DataFactoryElement<string>>();
             foreach (var property in element.EnumerateObject())
             {
                 if (property.NameEquals("writeBehavior"u8))
@@ -151,7 +151,7 @@ internal static MongoDBV2Sink DeserializeMongoDBV2Sink(JsonElement element)
                     disableMetricsCollection = JsonSerializer.Deserialize<DataFactoryElement<bool>>(property.Value.GetRawText());
                     continue;
                 }
-                additionalPropertiesDictionary.Add(property.Name, BinaryData.FromString(property.Value.GetRawText()));
+                additionalPropertiesDictionary.Add(property.Name, JsonSerializer.Deserialize<DataFactoryElement<string>>(property.Value.GetRawText()));
             }
             additionalProperties = additionalPropertiesDictionary;
             return new MongoDBV2Sink(type, writeBatchSize.Value, writeBatchTimeout.Value, sinkRetryCount.Value, sinkRetryWait.Value, maxConcurrentConnections.Value, disableMetricsCollection.Value, additionalProperties, writeBehavior.Value);
diff --git a/src/AzureDataFactory.TestingFramework/Generated/Models/MongoDBV2Sink.cs b/src/AzureDataFactory.TestingFramework/Generated/Models/MongoDBV2Sink.cs
index c31dcb88..b6005c20 100644
--- a/src/AzureDataFactory.TestingFramework/Generated/Models/MongoDBV2Sink.cs
+++ b/src/AzureDataFactory.TestingFramework/Generated/Models/MongoDBV2Sink.cs
@@ -28,7 +28,7 @@ public MongoDBV2Sink()
         /// <param name="disableMetricsCollection"> If true, disable data store metrics collection. Default is false. Type: boolean (or Expression with resultType boolean). </param>
         /// <param name="additionalProperties"> Additional Properties. </param>
         /// <param name="writeBehavior"> Specifies whether the document with same key to be overwritten (upsert) rather than throw exception (insert). The default value is "insert". Type: string (or Expression with resultType string). Type: string (or Expression with resultType string). </param>
-        internal MongoDBV2Sink(string copySinkType, DataFactoryElement<int> writeBatchSize, DataFactoryElement<string> writeBatchTimeout, DataFactoryElement<int> sinkRetryCount, DataFactoryElement<string> sinkRetryWait, DataFactoryElement<int> maxConcurrentConnections, DataFactoryElement<bool> disableMetricsCollection, IDictionary<string, BinaryData> additionalProperties, DataFactoryElement<string> writeBehavior) : base(copySinkType, writeBatchSize, writeBatchTimeout, sinkRetryCount, sinkRetryWait, maxConcurrentConnections, disableMetricsCollection, additionalProperties)
+        internal MongoDBV2Sink(string copySinkType, DataFactoryElement<int> writeBatchSize, DataFactoryElement<string> writeBatchTimeout, DataFactoryElement<int> sinkRetryCount, DataFactoryElement<string> sinkRetryWait, DataFactoryElement<int> maxConcurrentConnections, DataFactoryElement<bool> disableMetricsCollection, IDictionary<string, DataFactoryElement<string>> additionalProperties, DataFactoryElement<string> writeBehavior) : base(copySinkType, writeBatchSize, writeBatchTimeout, sinkRetryCount, sinkRetryWait, maxConcurrentConnections, disableMetricsCollection, additionalProperties)
         {
             WriteBehavior = writeBehavior;
             CopySinkType = copySinkType ?? "MongoDbV2Sink";
diff --git a/src/AzureDataFactory.TestingFramework/Generated/Models/MongoDBV2Source.Serialization.cs b/src/AzureDataFactory.TestingFramework/Generated/Models/MongoDBV2Source.Serialization.cs
index 0cb3ac19..f63aac06 100644
--- a/src/AzureDataFactory.TestingFramework/Generated/Models/MongoDBV2Source.Serialization.cs
+++ b/src/AzureDataFactory.TestingFramework/Generated/Models/MongoDBV2Source.Serialization.cs
@@ -95,8 +95,8 @@ internal static MongoDBV2Source DeserializeMongoDBV2Source(JsonElement element)
             Optional<DataFactoryElement<string>> sourceRetryWait = default;
             Optional<DataFactoryElement<int>> maxConcurrentConnections = default;
             Optional<DataFactoryElement<bool>> disableMetricsCollection = default;
-            IDictionary<string, BinaryData> additionalProperties = default;
-            Dictionary<string, BinaryData> additionalPropertiesDictionary = new Dictionary<string, BinaryData>();
+            IDictionary<string, DataFactoryElement<string>> additionalProperties = default;
+            Dictionary<string, DataFactoryElement<string>> additionalPropertiesDictionary = new Dictionary<string, DataFactoryElement<string>>();
             foreach (var property in element.EnumerateObject())
             {
                 if (property.NameEquals("filter"u8))
@@ -185,7 +185,7 @@ internal static MongoDBV2Source DeserializeMongoDBV2Source(JsonElement element)
                     disableMetricsCollection = JsonSerializer.Deserialize<DataFactoryElement<bool>>(property.Value.GetRawText());
                     continue;
                 }
-                additionalPropertiesDictionary.Add(property.Name, BinaryData.FromString(property.Value.GetRawText()));
+                additionalPropertiesDictionary.Add(property.Name, JsonSerializer.Deserialize<DataFactoryElement<string>>(property.Value.GetRawText()));
             }
             additionalProperties = additionalPropertiesDictionary;
             return new MongoDBV2Source(type, sourceRetryCount.Value, sourceRetryWait.Value, maxConcurrentConnections.Value, disableMetricsCollection.Value, additionalProperties, filter.Value, cursorMethods.Value, batchSize.Value, queryTimeout.Value, additionalColumns.Value);
diff --git a/src/AzureDataFactory.TestingFramework/Generated/Models/MongoDBV2Source.cs b/src/AzureDataFactory.TestingFramework/Generated/Models/MongoDBV2Source.cs
index 0bda33a5..e47c884a 100644
--- a/src/AzureDataFactory.TestingFramework/Generated/Models/MongoDBV2Source.cs
+++ b/src/AzureDataFactory.TestingFramework/Generated/Models/MongoDBV2Source.cs
@@ -30,7 +30,7 @@ public MongoDBV2Source()
         /// <param name="batchSize"> Specifies the number of documents to return in each batch of the response from MongoDB instance. In most cases, modifying the batch size will not affect the user or the application. This property's main purpose is to avoid hit the limitation of response size. Type: integer (or Expression with resultType integer). </param>
         /// <param name="queryTimeout"> Query timeout. Type: string (or Expression with resultType string), pattern: ((\d+)\.)?(\d\d):(60|([0-5][0-9])):(60|([0-5][0-9])). </param>
         /// <param name="additionalColumns"> Specifies the additional columns to be added to source data. Type: array of objects(AdditionalColumns) (or Expression with resultType array of objects). </param>
-        internal MongoDBV2Source(string copySourceType, DataFactoryElement<int> sourceRetryCount, DataFactoryElement<string> sourceRetryWait, DataFactoryElement<int> maxConcurrentConnections, DataFactoryElement<bool> disableMetricsCollection, IDictionary<string, BinaryData> additionalProperties, DataFactoryElement<string> filter, MongoDBCursorMethodsProperties cursorMethods, DataFactoryElement<int> batchSize, DataFactoryElement<string> queryTimeout, BinaryData additionalColumns) : base(copySourceType, sourceRetryCount, sourceRetryWait, maxConcurrentConnections, disableMetricsCollection, additionalProperties)
+        internal MongoDBV2Source(string copySourceType, DataFactoryElement<int> sourceRetryCount, DataFactoryElement<string> sourceRetryWait, DataFactoryElement<int> maxConcurrentConnections, DataFactoryElement<bool> disableMetricsCollection, IDictionary<string, DataFactoryElement<string>> additionalProperties, DataFactoryElement<string> filter, MongoDBCursorMethodsProperties cursorMethods, DataFactoryElement<int> batchSize, DataFactoryElement<string> queryTimeout, BinaryData additionalColumns) : base(copySourceType, sourceRetryCount, sourceRetryWait, maxConcurrentConnections, disableMetricsCollection, additionalProperties)
         {
             Filter = filter;
             CursorMethods = cursorMethods;
diff --git a/src/AzureDataFactory.TestingFramework/Generated/Models/MultiplePipelineTrigger.Serialization.cs b/src/AzureDataFactory.TestingFramework/Generated/Models/MultiplePipelineTrigger.Serialization.cs
index c1f0d56d..21138b3c 100644
--- a/src/AzureDataFactory.TestingFramework/Generated/Models/MultiplePipelineTrigger.Serialization.cs
+++ b/src/AzureDataFactory.TestingFramework/Generated/Models/MultiplePipelineTrigger.Serialization.cs
@@ -7,6 +7,7 @@
 
 using System.Text.Json;
 using Azure.Core;
+using Azure.Core.Expressions.DataFactory;
 
 namespace AzureDataFactory.TestingFramework.Models
 {
@@ -84,8 +85,8 @@ internal static MultiplePipelineTrigger DeserializeMultiplePipelineTrigger(JsonE
             Optional<string> description = default;
             Optional<DataFactoryTriggerRuntimeState> runtimeState = default;
             Optional<IList<BinaryData>> annotations = default;
-            IDictionary<string, BinaryData> additionalProperties = default;
-            Dictionary<string, BinaryData> additionalPropertiesDictionary = new Dictionary<string, BinaryData>();
+            IDictionary<string, DataFactoryElement<string>> additionalProperties = default;
+            Dictionary<string, DataFactoryElement<string>> additionalPropertiesDictionary = new Dictionary<string, DataFactoryElement<string>>();
             foreach (var property in element.EnumerateObject())
             {
                 if (property.NameEquals("pipelines"u8))
@@ -142,7 +143,7 @@ internal static MultiplePipelineTrigger DeserializeMultiplePipelineTrigger(JsonE
                     annotations = array;
                     continue;
                 }
-                additionalPropertiesDictionary.Add(property.Name, BinaryData.FromString(property.Value.GetRawText()));
+                additionalPropertiesDictionary.Add(property.Name, JsonSerializer.Deserialize<DataFactoryElement<string>>(property.Value.GetRawText()));
             }
             additionalProperties = additionalPropertiesDictionary;
             return new MultiplePipelineTrigger(type, description.Value, Optional.ToNullable(runtimeState), Optional.ToList(annotations), additionalProperties, Optional.ToList(pipelines));
diff --git a/src/AzureDataFactory.TestingFramework/Generated/Models/MultiplePipelineTrigger.cs b/src/AzureDataFactory.TestingFramework/Generated/Models/MultiplePipelineTrigger.cs
index 2bfb357c..fef9ddda 100644
--- a/src/AzureDataFactory.TestingFramework/Generated/Models/MultiplePipelineTrigger.cs
+++ b/src/AzureDataFactory.TestingFramework/Generated/Models/MultiplePipelineTrigger.cs
@@ -6,6 +6,7 @@
 #nullable disable
 
 using Azure.Core;
+using Azure.Core.Expressions.DataFactory;
 
 namespace AzureDataFactory.TestingFramework.Models
 {
@@ -30,7 +31,7 @@ public MultiplePipelineTrigger()
         /// <param name="annotations"> List of tags that can be used for describing the trigger. </param>
         /// <param name="additionalProperties"> Additional Properties. </param>
         /// <param name="pipelines"> Pipelines that need to be started. </param>
-        internal MultiplePipelineTrigger(string triggerType, string description, DataFactoryTriggerRuntimeState? runtimeState, IList<BinaryData> annotations, IDictionary<string, BinaryData> additionalProperties, IList<TriggerPipelineReference> pipelines) : base(triggerType, description, runtimeState, annotations, additionalProperties)
+        internal MultiplePipelineTrigger(string triggerType, string description, DataFactoryTriggerRuntimeState? runtimeState, IList<BinaryData> annotations, IDictionary<string, DataFactoryElement<string>> additionalProperties, IList<TriggerPipelineReference> pipelines) : base(triggerType, description, runtimeState, annotations, additionalProperties)
         {
             Pipelines = pipelines;
             TriggerType = triggerType ?? "MultiplePipelineTrigger";
diff --git a/src/AzureDataFactory.TestingFramework/Generated/Models/MySqlLinkedService.Serialization.cs b/src/AzureDataFactory.TestingFramework/Generated/Models/MySqlLinkedService.Serialization.cs
index b43bec18..d877dbf7 100644
--- a/src/AzureDataFactory.TestingFramework/Generated/Models/MySqlLinkedService.Serialization.cs
+++ b/src/AzureDataFactory.TestingFramework/Generated/Models/MySqlLinkedService.Serialization.cs
@@ -99,8 +99,8 @@ internal static MySqlLinkedService DeserializeMySqlLinkedService(JsonElement ele
             DataFactoryElement<string> connectionString = default;
             Optional<DataFactoryKeyVaultSecretReference> password = default;
             Optional<string> encryptedCredential = default;
-            IDictionary<string, BinaryData> additionalProperties = default;
-            Dictionary<string, BinaryData> additionalPropertiesDictionary = new Dictionary<string, BinaryData>();
+            IDictionary<string, DataFactoryElement<string>> additionalProperties = default;
+            Dictionary<string, DataFactoryElement<string>> additionalPropertiesDictionary = new Dictionary<string, DataFactoryElement<string>>();
             foreach (var property in element.EnumerateObject())
             {
                 if (property.NameEquals("type"u8))
@@ -188,7 +188,7 @@ internal static MySqlLinkedService DeserializeMySqlLinkedService(JsonElement ele
                     }
                     continue;
                 }
-                additionalPropertiesDictionary.Add(property.Name, BinaryData.FromString(property.Value.GetRawText()));
+                additionalPropertiesDictionary.Add(property.Name, JsonSerializer.Deserialize<DataFactoryElement<string>>(property.Value.GetRawText()));
             }
             additionalProperties = additionalPropertiesDictionary;
             return new MySqlLinkedService(type, connectVia.Value, description.Value, Optional.ToDictionary(parameters), Optional.ToList(annotations), additionalProperties, connectionString, password, encryptedCredential.Value);
diff --git a/src/AzureDataFactory.TestingFramework/Generated/Models/MySqlLinkedService.cs b/src/AzureDataFactory.TestingFramework/Generated/Models/MySqlLinkedService.cs
index ef67e298..432ae79e 100644
--- a/src/AzureDataFactory.TestingFramework/Generated/Models/MySqlLinkedService.cs
+++ b/src/AzureDataFactory.TestingFramework/Generated/Models/MySqlLinkedService.cs
@@ -34,7 +34,7 @@ public MySqlLinkedService(DataFactoryElement<string> connectionString)
         /// <param name="connectionString"> The connection string. Type: string, SecureString or AzureKeyVaultSecretReference. </param>
         /// <param name="password"> The Azure key vault secret reference of password in connection string. </param>
         /// <param name="encryptedCredential"> The encrypted credential used for authentication. Credentials are encrypted using the integration runtime credential manager. Type: string. </param>
-        internal MySqlLinkedService(string linkedServiceType, IntegrationRuntimeReference connectVia, string description, IDictionary<string, EntityParameterSpecification> parameters, IList<BinaryData> annotations, IDictionary<string, BinaryData> additionalProperties, DataFactoryElement<string> connectionString, DataFactoryKeyVaultSecretReference password, string encryptedCredential) : base(linkedServiceType, connectVia, description, parameters, annotations, additionalProperties)
+        internal MySqlLinkedService(string linkedServiceType, IntegrationRuntimeReference connectVia, string description, IDictionary<string, EntityParameterSpecification> parameters, IList<BinaryData> annotations, IDictionary<string, DataFactoryElement<string>> additionalProperties, DataFactoryElement<string> connectionString, DataFactoryKeyVaultSecretReference password, string encryptedCredential) : base(linkedServiceType, connectVia, description, parameters, annotations, additionalProperties)
         {
             ConnectionString = connectionString;
             Password = password;
diff --git a/src/AzureDataFactory.TestingFramework/Generated/Models/MySqlSource.Serialization.cs b/src/AzureDataFactory.TestingFramework/Generated/Models/MySqlSource.Serialization.cs
index e9ef229f..5de61b4d 100644
--- a/src/AzureDataFactory.TestingFramework/Generated/Models/MySqlSource.Serialization.cs
+++ b/src/AzureDataFactory.TestingFramework/Generated/Models/MySqlSource.Serialization.cs
@@ -83,8 +83,8 @@ internal static MySqlSource DeserializeMySqlSource(JsonElement element)
             Optional<DataFactoryElement<string>> sourceRetryWait = default;
             Optional<DataFactoryElement<int>> maxConcurrentConnections = default;
             Optional<DataFactoryElement<bool>> disableMetricsCollection = default;
-            IDictionary<string, BinaryData> additionalProperties = default;
-            Dictionary<string, BinaryData> additionalPropertiesDictionary = new Dictionary<string, BinaryData>();
+            IDictionary<string, DataFactoryElement<string>> additionalProperties = default;
+            Dictionary<string, DataFactoryElement<string>> additionalPropertiesDictionary = new Dictionary<string, DataFactoryElement<string>>();
             foreach (var property in element.EnumerateObject())
             {
                 if (property.NameEquals("query"u8))
@@ -155,7 +155,7 @@ internal static MySqlSource DeserializeMySqlSource(JsonElement element)
                     disableMetricsCollection = JsonSerializer.Deserialize<DataFactoryElement<bool>>(property.Value.GetRawText());
                     continue;
                 }
-                additionalPropertiesDictionary.Add(property.Name, BinaryData.FromString(property.Value.GetRawText()));
+                additionalPropertiesDictionary.Add(property.Name, JsonSerializer.Deserialize<DataFactoryElement<string>>(property.Value.GetRawText()));
             }
             additionalProperties = additionalPropertiesDictionary;
             return new MySqlSource(type, sourceRetryCount.Value, sourceRetryWait.Value, maxConcurrentConnections.Value, disableMetricsCollection.Value, additionalProperties, queryTimeout.Value, additionalColumns.Value, query.Value);
diff --git a/src/AzureDataFactory.TestingFramework/Generated/Models/MySqlSource.cs b/src/AzureDataFactory.TestingFramework/Generated/Models/MySqlSource.cs
index 347bbeb8..7a44f87b 100644
--- a/src/AzureDataFactory.TestingFramework/Generated/Models/MySqlSource.cs
+++ b/src/AzureDataFactory.TestingFramework/Generated/Models/MySqlSource.cs
@@ -28,7 +28,7 @@ public MySqlSource()
         /// <param name="queryTimeout"> Query timeout. Type: string (or Expression with resultType string), pattern: ((\d+)\.)?(\d\d):(60|([0-5][0-9])):(60|([0-5][0-9])). </param>
         /// <param name="additionalColumns"> Specifies the additional columns to be added to source data. Type: array of objects(AdditionalColumns) (or Expression with resultType array of objects). </param>
         /// <param name="query"> Database query. Type: string (or Expression with resultType string). </param>
-        internal MySqlSource(string copySourceType, DataFactoryElement<int> sourceRetryCount, DataFactoryElement<string> sourceRetryWait, DataFactoryElement<int> maxConcurrentConnections, DataFactoryElement<bool> disableMetricsCollection, IDictionary<string, BinaryData> additionalProperties, DataFactoryElement<string> queryTimeout, BinaryData additionalColumns, DataFactoryElement<string> query) : base(copySourceType, sourceRetryCount, sourceRetryWait, maxConcurrentConnections, disableMetricsCollection, additionalProperties, queryTimeout, additionalColumns)
+        internal MySqlSource(string copySourceType, DataFactoryElement<int> sourceRetryCount, DataFactoryElement<string> sourceRetryWait, DataFactoryElement<int> maxConcurrentConnections, DataFactoryElement<bool> disableMetricsCollection, IDictionary<string, DataFactoryElement<string>> additionalProperties, DataFactoryElement<string> queryTimeout, BinaryData additionalColumns, DataFactoryElement<string> query) : base(copySourceType, sourceRetryCount, sourceRetryWait, maxConcurrentConnections, disableMetricsCollection, additionalProperties, queryTimeout, additionalColumns)
         {
             Query = query;
             CopySourceType = copySourceType ?? "MySqlSource";
diff --git a/src/AzureDataFactory.TestingFramework/Generated/Models/MySqlTableDataset.Serialization.cs b/src/AzureDataFactory.TestingFramework/Generated/Models/MySqlTableDataset.Serialization.cs
index 8eaa170e..2212e2ba 100644
--- a/src/AzureDataFactory.TestingFramework/Generated/Models/MySqlTableDataset.Serialization.cs
+++ b/src/AzureDataFactory.TestingFramework/Generated/Models/MySqlTableDataset.Serialization.cs
@@ -104,8 +104,8 @@ internal static MySqlTableDataset DeserializeMySqlTableDataset(JsonElement eleme
             Optional<IList<BinaryData>> annotations = default;
             Optional<DatasetFolder> folder = default;
             Optional<DataFactoryElement<string>> tableName = default;
-            IDictionary<string, BinaryData> additionalProperties = default;
-            Dictionary<string, BinaryData> additionalPropertiesDictionary = new Dictionary<string, BinaryData>();
+            IDictionary<string, DataFactoryElement<string>> additionalProperties = default;
+            Dictionary<string, DataFactoryElement<string>> additionalPropertiesDictionary = new Dictionary<string, DataFactoryElement<string>>();
             foreach (var property in element.EnumerateObject())
             {
                 if (property.NameEquals("type"u8))
@@ -206,7 +206,7 @@ internal static MySqlTableDataset DeserializeMySqlTableDataset(JsonElement eleme
                     }
                     continue;
                 }
-                additionalPropertiesDictionary.Add(property.Name, BinaryData.FromString(property.Value.GetRawText()));
+                additionalPropertiesDictionary.Add(property.Name, JsonSerializer.Deserialize<DataFactoryElement<string>>(property.Value.GetRawText()));
             }
             additionalProperties = additionalPropertiesDictionary;
             return new MySqlTableDataset(type, description.Value, structure.Value, schema.Value, linkedServiceName, Optional.ToDictionary(parameters), Optional.ToList(annotations), folder.Value, additionalProperties, tableName.Value);
diff --git a/src/AzureDataFactory.TestingFramework/Generated/Models/MySqlTableDataset.cs b/src/AzureDataFactory.TestingFramework/Generated/Models/MySqlTableDataset.cs
index 62075cd9..1c55769c 100644
--- a/src/AzureDataFactory.TestingFramework/Generated/Models/MySqlTableDataset.cs
+++ b/src/AzureDataFactory.TestingFramework/Generated/Models/MySqlTableDataset.cs
@@ -34,7 +34,7 @@ public MySqlTableDataset(DataFactoryLinkedServiceReference linkedServiceName) :
         /// <param name="folder"> The folder that this Dataset is in. If not specified, Dataset will appear at the root level. </param>
         /// <param name="additionalProperties"> Additional Properties. </param>
         /// <param name="tableName"> The MySQL table name. Type: string (or Expression with resultType string). </param>
-        internal MySqlTableDataset(string datasetType, string description, DataFactoryElement<IList<DatasetDataElement>> structure, DataFactoryElement<IList<DatasetSchemaDataElement>> schema, DataFactoryLinkedServiceReference linkedServiceName, IDictionary<string, EntityParameterSpecification> parameters, IList<BinaryData> annotations, DatasetFolder folder, IDictionary<string, BinaryData> additionalProperties, DataFactoryElement<string> tableName) : base(datasetType, description, structure, schema, linkedServiceName, parameters, annotations, folder, additionalProperties)
+        internal MySqlTableDataset(string datasetType, string description, DataFactoryElement<IList<DatasetDataElement>> structure, DataFactoryElement<IList<DatasetSchemaDataElement>> schema, DataFactoryLinkedServiceReference linkedServiceName, IDictionary<string, EntityParameterSpecification> parameters, IList<BinaryData> annotations, DatasetFolder folder, IDictionary<string, DataFactoryElement<string>> additionalProperties, DataFactoryElement<string> tableName) : base(datasetType, description, structure, schema, linkedServiceName, parameters, annotations, folder, additionalProperties)
         {
             TableName = tableName;
             DatasetType = datasetType ?? "MySqlTable";
diff --git a/src/AzureDataFactory.TestingFramework/Generated/Models/NetezzaLinkedService.Serialization.cs b/src/AzureDataFactory.TestingFramework/Generated/Models/NetezzaLinkedService.Serialization.cs
index c73ed621..ac102ce4 100644
--- a/src/AzureDataFactory.TestingFramework/Generated/Models/NetezzaLinkedService.Serialization.cs
+++ b/src/AzureDataFactory.TestingFramework/Generated/Models/NetezzaLinkedService.Serialization.cs
@@ -102,8 +102,8 @@ internal static NetezzaLinkedService DeserializeNetezzaLinkedService(JsonElement
             Optional<DataFactoryElement<string>> connectionString = default;
             Optional<DataFactoryKeyVaultSecretReference> password = default;
             Optional<string> encryptedCredential = default;
-            IDictionary<string, BinaryData> additionalProperties = default;
-            Dictionary<string, BinaryData> additionalPropertiesDictionary = new Dictionary<string, BinaryData>();
+            IDictionary<string, DataFactoryElement<string>> additionalProperties = default;
+            Dictionary<string, DataFactoryElement<string>> additionalPropertiesDictionary = new Dictionary<string, DataFactoryElement<string>>();
             foreach (var property in element.EnumerateObject())
             {
                 if (property.NameEquals("type"u8))
@@ -195,7 +195,7 @@ internal static NetezzaLinkedService DeserializeNetezzaLinkedService(JsonElement
                     }
                     continue;
                 }
-                additionalPropertiesDictionary.Add(property.Name, BinaryData.FromString(property.Value.GetRawText()));
+                additionalPropertiesDictionary.Add(property.Name, JsonSerializer.Deserialize<DataFactoryElement<string>>(property.Value.GetRawText()));
             }
             additionalProperties = additionalPropertiesDictionary;
             return new NetezzaLinkedService(type, connectVia.Value, description.Value, Optional.ToDictionary(parameters), Optional.ToList(annotations), additionalProperties, connectionString.Value, password, encryptedCredential.Value);
diff --git a/src/AzureDataFactory.TestingFramework/Generated/Models/NetezzaLinkedService.cs b/src/AzureDataFactory.TestingFramework/Generated/Models/NetezzaLinkedService.cs
index 6b90da9b..5cbcc6b5 100644
--- a/src/AzureDataFactory.TestingFramework/Generated/Models/NetezzaLinkedService.cs
+++ b/src/AzureDataFactory.TestingFramework/Generated/Models/NetezzaLinkedService.cs
@@ -28,7 +28,7 @@ public NetezzaLinkedService()
         /// <param name="connectionString"> An ODBC connection string. Type: string, SecureString or AzureKeyVaultSecretReference. </param>
         /// <param name="password"> The Azure key vault secret reference of password in connection string. </param>
         /// <param name="encryptedCredential"> The encrypted credential used for authentication. Credentials are encrypted using the integration runtime credential manager. Type: string. </param>
-        internal NetezzaLinkedService(string linkedServiceType, IntegrationRuntimeReference connectVia, string description, IDictionary<string, EntityParameterSpecification> parameters, IList<BinaryData> annotations, IDictionary<string, BinaryData> additionalProperties, DataFactoryElement<string> connectionString, DataFactoryKeyVaultSecretReference password, string encryptedCredential) : base(linkedServiceType, connectVia, description, parameters, annotations, additionalProperties)
+        internal NetezzaLinkedService(string linkedServiceType, IntegrationRuntimeReference connectVia, string description, IDictionary<string, EntityParameterSpecification> parameters, IList<BinaryData> annotations, IDictionary<string, DataFactoryElement<string>> additionalProperties, DataFactoryElement<string> connectionString, DataFactoryKeyVaultSecretReference password, string encryptedCredential) : base(linkedServiceType, connectVia, description, parameters, annotations, additionalProperties)
         {
             ConnectionString = connectionString;
             Password = password;
diff --git a/src/AzureDataFactory.TestingFramework/Generated/Models/NetezzaSource.Serialization.cs b/src/AzureDataFactory.TestingFramework/Generated/Models/NetezzaSource.Serialization.cs
index e2faf510..717a3325 100644
--- a/src/AzureDataFactory.TestingFramework/Generated/Models/NetezzaSource.Serialization.cs
+++ b/src/AzureDataFactory.TestingFramework/Generated/Models/NetezzaSource.Serialization.cs
@@ -99,8 +99,8 @@ internal static NetezzaSource DeserializeNetezzaSource(JsonElement element)
             Optional<DataFactoryElement<string>> sourceRetryWait = default;
             Optional<DataFactoryElement<int>> maxConcurrentConnections = default;
             Optional<DataFactoryElement<bool>> disableMetricsCollection = default;
-            IDictionary<string, BinaryData> additionalProperties = default;
-            Dictionary<string, BinaryData> additionalPropertiesDictionary = new Dictionary<string, BinaryData>();
+            IDictionary<string, DataFactoryElement<string>> additionalProperties = default;
+            Dictionary<string, DataFactoryElement<string>> additionalPropertiesDictionary = new Dictionary<string, DataFactoryElement<string>>();
             foreach (var property in element.EnumerateObject())
             {
                 if (property.NameEquals("query"u8))
@@ -189,7 +189,7 @@ internal static NetezzaSource DeserializeNetezzaSource(JsonElement element)
                     disableMetricsCollection = JsonSerializer.Deserialize<DataFactoryElement<bool>>(property.Value.GetRawText());
                     continue;
                 }
-                additionalPropertiesDictionary.Add(property.Name, BinaryData.FromString(property.Value.GetRawText()));
+                additionalPropertiesDictionary.Add(property.Name, JsonSerializer.Deserialize<DataFactoryElement<string>>(property.Value.GetRawText()));
             }
             additionalProperties = additionalPropertiesDictionary;
             return new NetezzaSource(type, sourceRetryCount.Value, sourceRetryWait.Value, maxConcurrentConnections.Value, disableMetricsCollection.Value, additionalProperties, queryTimeout.Value, additionalColumns.Value, query.Value, partitionOption.Value, partitionSettings.Value);
diff --git a/src/AzureDataFactory.TestingFramework/Generated/Models/NetezzaSource.cs b/src/AzureDataFactory.TestingFramework/Generated/Models/NetezzaSource.cs
index 0cabc1e3..817f2420 100644
--- a/src/AzureDataFactory.TestingFramework/Generated/Models/NetezzaSource.cs
+++ b/src/AzureDataFactory.TestingFramework/Generated/Models/NetezzaSource.cs
@@ -30,7 +30,7 @@ public NetezzaSource()
         /// <param name="query"> A query to retrieve data from source. Type: string (or Expression with resultType string). </param>
         /// <param name="partitionOption"> The partition mechanism that will be used for Netezza read in parallel. Possible values include: "None", "DataSlice", "DynamicRange". </param>
         /// <param name="partitionSettings"> The settings that will be leveraged for Netezza source partitioning. </param>
-        internal NetezzaSource(string copySourceType, DataFactoryElement<int> sourceRetryCount, DataFactoryElement<string> sourceRetryWait, DataFactoryElement<int> maxConcurrentConnections, DataFactoryElement<bool> disableMetricsCollection, IDictionary<string, BinaryData> additionalProperties, DataFactoryElement<string> queryTimeout, BinaryData additionalColumns, DataFactoryElement<string> query, BinaryData partitionOption, NetezzaPartitionSettings partitionSettings) : base(copySourceType, sourceRetryCount, sourceRetryWait, maxConcurrentConnections, disableMetricsCollection, additionalProperties, queryTimeout, additionalColumns)
+        internal NetezzaSource(string copySourceType, DataFactoryElement<int> sourceRetryCount, DataFactoryElement<string> sourceRetryWait, DataFactoryElement<int> maxConcurrentConnections, DataFactoryElement<bool> disableMetricsCollection, IDictionary<string, DataFactoryElement<string>> additionalProperties, DataFactoryElement<string> queryTimeout, BinaryData additionalColumns, DataFactoryElement<string> query, BinaryData partitionOption, NetezzaPartitionSettings partitionSettings) : base(copySourceType, sourceRetryCount, sourceRetryWait, maxConcurrentConnections, disableMetricsCollection, additionalProperties, queryTimeout, additionalColumns)
         {
             Query = query;
             PartitionOption = partitionOption;
diff --git a/src/AzureDataFactory.TestingFramework/Generated/Models/NetezzaTableDataset.Serialization.cs b/src/AzureDataFactory.TestingFramework/Generated/Models/NetezzaTableDataset.Serialization.cs
index 4db6b443..c4595f40 100644
--- a/src/AzureDataFactory.TestingFramework/Generated/Models/NetezzaTableDataset.Serialization.cs
+++ b/src/AzureDataFactory.TestingFramework/Generated/Models/NetezzaTableDataset.Serialization.cs
@@ -120,8 +120,8 @@ internal static NetezzaTableDataset DeserializeNetezzaTableDataset(JsonElement e
             Optional<BinaryData> tableName = default;
             Optional<DataFactoryElement<string>> table = default;
             Optional<DataFactoryElement<string>> schema0 = default;
-            IDictionary<string, BinaryData> additionalProperties = default;
-            Dictionary<string, BinaryData> additionalPropertiesDictionary = new Dictionary<string, BinaryData>();
+            IDictionary<string, DataFactoryElement<string>> additionalProperties = default;
+            Dictionary<string, DataFactoryElement<string>> additionalPropertiesDictionary = new Dictionary<string, DataFactoryElement<string>>();
             foreach (var property in element.EnumerateObject())
             {
                 if (property.NameEquals("type"u8))
@@ -240,7 +240,7 @@ internal static NetezzaTableDataset DeserializeNetezzaTableDataset(JsonElement e
                     }
                     continue;
                 }
-                additionalPropertiesDictionary.Add(property.Name, BinaryData.FromString(property.Value.GetRawText()));
+                additionalPropertiesDictionary.Add(property.Name, JsonSerializer.Deserialize<DataFactoryElement<string>>(property.Value.GetRawText()));
             }
             additionalProperties = additionalPropertiesDictionary;
             return new NetezzaTableDataset(type, description.Value, structure.Value, schema.Value, linkedServiceName, Optional.ToDictionary(parameters), Optional.ToList(annotations), folder.Value, additionalProperties, tableName.Value, table.Value, schema0.Value);
diff --git a/src/AzureDataFactory.TestingFramework/Generated/Models/NetezzaTableDataset.cs b/src/AzureDataFactory.TestingFramework/Generated/Models/NetezzaTableDataset.cs
index 35ac0c39..6c08ba80 100644
--- a/src/AzureDataFactory.TestingFramework/Generated/Models/NetezzaTableDataset.cs
+++ b/src/AzureDataFactory.TestingFramework/Generated/Models/NetezzaTableDataset.cs
@@ -36,7 +36,7 @@ public NetezzaTableDataset(DataFactoryLinkedServiceReference linkedServiceName)
         /// <param name="tableName"> This property will be retired. Please consider using schema + table properties instead. </param>
         /// <param name="table"> The table name of the Netezza. Type: string (or Expression with resultType string). </param>
         /// <param name="schemaTypePropertiesSchema"> The schema name of the Netezza. Type: string (or Expression with resultType string). </param>
-        internal NetezzaTableDataset(string datasetType, string description, DataFactoryElement<IList<DatasetDataElement>> structure, DataFactoryElement<IList<DatasetSchemaDataElement>> schema, DataFactoryLinkedServiceReference linkedServiceName, IDictionary<string, EntityParameterSpecification> parameters, IList<BinaryData> annotations, DatasetFolder folder, IDictionary<string, BinaryData> additionalProperties, BinaryData tableName, DataFactoryElement<string> table, DataFactoryElement<string> schemaTypePropertiesSchema) : base(datasetType, description, structure, schema, linkedServiceName, parameters, annotations, folder, additionalProperties)
+        internal NetezzaTableDataset(string datasetType, string description, DataFactoryElement<IList<DatasetDataElement>> structure, DataFactoryElement<IList<DatasetSchemaDataElement>> schema, DataFactoryLinkedServiceReference linkedServiceName, IDictionary<string, EntityParameterSpecification> parameters, IList<BinaryData> annotations, DatasetFolder folder, IDictionary<string, DataFactoryElement<string>> additionalProperties, BinaryData tableName, DataFactoryElement<string> table, DataFactoryElement<string> schemaTypePropertiesSchema) : base(datasetType, description, structure, schema, linkedServiceName, parameters, annotations, folder, additionalProperties)
         {
             TableName = tableName;
             Table = table;
diff --git a/src/AzureDataFactory.TestingFramework/Generated/Models/ODataLinkedService.Serialization.cs b/src/AzureDataFactory.TestingFramework/Generated/Models/ODataLinkedService.Serialization.cs
index 9638f765..3e8e8be6 100644
--- a/src/AzureDataFactory.TestingFramework/Generated/Models/ODataLinkedService.Serialization.cs
+++ b/src/AzureDataFactory.TestingFramework/Generated/Models/ODataLinkedService.Serialization.cs
@@ -165,8 +165,8 @@ internal static ODataLinkedService DeserializeODataLinkedService(JsonElement ele
             Optional<DataFactorySecretBaseDefinition> servicePrincipalEmbeddedCert = default;
             Optional<DataFactorySecretBaseDefinition> servicePrincipalEmbeddedCertPassword = default;
             Optional<string> encryptedCredential = default;
-            IDictionary<string, BinaryData> additionalProperties = default;
-            Dictionary<string, BinaryData> additionalPropertiesDictionary = new Dictionary<string, BinaryData>();
+            IDictionary<string, DataFactoryElement<string>> additionalProperties = default;
+            Dictionary<string, DataFactoryElement<string>> additionalPropertiesDictionary = new Dictionary<string, DataFactoryElement<string>>();
             foreach (var property in element.EnumerateObject())
             {
                 if (property.NameEquals("type"u8))
@@ -353,7 +353,7 @@ internal static ODataLinkedService DeserializeODataLinkedService(JsonElement ele
                     }
                     continue;
                 }
-                additionalPropertiesDictionary.Add(property.Name, BinaryData.FromString(property.Value.GetRawText()));
+                additionalPropertiesDictionary.Add(property.Name, JsonSerializer.Deserialize<DataFactoryElement<string>>(property.Value.GetRawText()));
             }
             additionalProperties = additionalPropertiesDictionary;
             return new ODataLinkedService(type, connectVia.Value, description.Value, Optional.ToDictionary(parameters), Optional.ToList(annotations), additionalProperties, url, Optional.ToNullable(authenticationType), userName.Value, password, authHeaders.Value, tenant.Value, servicePrincipalId.Value, azureCloudType.Value, aadResourceId.Value, Optional.ToNullable(aadServicePrincipalCredentialType), servicePrincipalKey, servicePrincipalEmbeddedCert, servicePrincipalEmbeddedCertPassword, encryptedCredential.Value);
diff --git a/src/AzureDataFactory.TestingFramework/Generated/Models/ODataLinkedService.cs b/src/AzureDataFactory.TestingFramework/Generated/Models/ODataLinkedService.cs
index 075b3e6a..f47bc16b 100644
--- a/src/AzureDataFactory.TestingFramework/Generated/Models/ODataLinkedService.cs
+++ b/src/AzureDataFactory.TestingFramework/Generated/Models/ODataLinkedService.cs
@@ -45,7 +45,7 @@ public ODataLinkedService(DataFactoryElement<string> uri)
         /// <param name="servicePrincipalEmbeddedCert"> Specify the base64 encoded certificate of your application registered in Azure Active Directory. Type: string (or Expression with resultType string). </param>
         /// <param name="servicePrincipalEmbeddedCertPassword"> Specify the password of your certificate if your certificate has a password and you are using AadServicePrincipal authentication. Type: string (or Expression with resultType string). </param>
         /// <param name="encryptedCredential"> The encrypted credential used for authentication. Credentials are encrypted using the integration runtime credential manager. Type: string. </param>
-        internal ODataLinkedService(string linkedServiceType, IntegrationRuntimeReference connectVia, string description, IDictionary<string, EntityParameterSpecification> parameters, IList<BinaryData> annotations, IDictionary<string, BinaryData> additionalProperties, DataFactoryElement<string> uri, ODataAuthenticationType? authenticationType, DataFactoryElement<string> userName, DataFactorySecretBaseDefinition password, DataFactoryElement<BinaryData> authHeaders, DataFactoryElement<string> tenant, DataFactoryElement<string> servicePrincipalId, DataFactoryElement<string> azureCloudType, DataFactoryElement<string> aadResourceId, ODataAadServicePrincipalCredentialType? aadServicePrincipalCredentialType, DataFactorySecretBaseDefinition servicePrincipalKey, DataFactorySecretBaseDefinition servicePrincipalEmbeddedCert, DataFactorySecretBaseDefinition servicePrincipalEmbeddedCertPassword, string encryptedCredential) : base(linkedServiceType, connectVia, description, parameters, annotations, additionalProperties)
+        internal ODataLinkedService(string linkedServiceType, IntegrationRuntimeReference connectVia, string description, IDictionary<string, EntityParameterSpecification> parameters, IList<BinaryData> annotations, IDictionary<string, DataFactoryElement<string>> additionalProperties, DataFactoryElement<string> uri, ODataAuthenticationType? authenticationType, DataFactoryElement<string> userName, DataFactorySecretBaseDefinition password, DataFactoryElement<BinaryData> authHeaders, DataFactoryElement<string> tenant, DataFactoryElement<string> servicePrincipalId, DataFactoryElement<string> azureCloudType, DataFactoryElement<string> aadResourceId, ODataAadServicePrincipalCredentialType? aadServicePrincipalCredentialType, DataFactorySecretBaseDefinition servicePrincipalKey, DataFactorySecretBaseDefinition servicePrincipalEmbeddedCert, DataFactorySecretBaseDefinition servicePrincipalEmbeddedCertPassword, string encryptedCredential) : base(linkedServiceType, connectVia, description, parameters, annotations, additionalProperties)
         {
             Uri = uri;
             AuthenticationType = authenticationType;
diff --git a/src/AzureDataFactory.TestingFramework/Generated/Models/ODataResourceDataset.Serialization.cs b/src/AzureDataFactory.TestingFramework/Generated/Models/ODataResourceDataset.Serialization.cs
index f1f2f2ce..87afec4b 100644
--- a/src/AzureDataFactory.TestingFramework/Generated/Models/ODataResourceDataset.Serialization.cs
+++ b/src/AzureDataFactory.TestingFramework/Generated/Models/ODataResourceDataset.Serialization.cs
@@ -104,8 +104,8 @@ internal static ODataResourceDataset DeserializeODataResourceDataset(JsonElement
             Optional<IList<BinaryData>> annotations = default;
             Optional<DatasetFolder> folder = default;
             Optional<DataFactoryElement<string>> path = default;
-            IDictionary<string, BinaryData> additionalProperties = default;
-            Dictionary<string, BinaryData> additionalPropertiesDictionary = new Dictionary<string, BinaryData>();
+            IDictionary<string, DataFactoryElement<string>> additionalProperties = default;
+            Dictionary<string, DataFactoryElement<string>> additionalPropertiesDictionary = new Dictionary<string, DataFactoryElement<string>>();
             foreach (var property in element.EnumerateObject())
             {
                 if (property.NameEquals("type"u8))
@@ -206,7 +206,7 @@ internal static ODataResourceDataset DeserializeODataResourceDataset(JsonElement
                     }
                     continue;
                 }
-                additionalPropertiesDictionary.Add(property.Name, BinaryData.FromString(property.Value.GetRawText()));
+                additionalPropertiesDictionary.Add(property.Name, JsonSerializer.Deserialize<DataFactoryElement<string>>(property.Value.GetRawText()));
             }
             additionalProperties = additionalPropertiesDictionary;
             return new ODataResourceDataset(type, description.Value, structure.Value, schema.Value, linkedServiceName, Optional.ToDictionary(parameters), Optional.ToList(annotations), folder.Value, additionalProperties, path.Value);
diff --git a/src/AzureDataFactory.TestingFramework/Generated/Models/ODataResourceDataset.cs b/src/AzureDataFactory.TestingFramework/Generated/Models/ODataResourceDataset.cs
index fa5ec2cf..4c974dff 100644
--- a/src/AzureDataFactory.TestingFramework/Generated/Models/ODataResourceDataset.cs
+++ b/src/AzureDataFactory.TestingFramework/Generated/Models/ODataResourceDataset.cs
@@ -34,7 +34,7 @@ public ODataResourceDataset(DataFactoryLinkedServiceReference linkedServiceName)
         /// <param name="folder"> The folder that this Dataset is in. If not specified, Dataset will appear at the root level. </param>
         /// <param name="additionalProperties"> Additional Properties. </param>
         /// <param name="path"> The OData resource path. Type: string (or Expression with resultType string). </param>
-        internal ODataResourceDataset(string datasetType, string description, DataFactoryElement<IList<DatasetDataElement>> structure, DataFactoryElement<IList<DatasetSchemaDataElement>> schema, DataFactoryLinkedServiceReference linkedServiceName, IDictionary<string, EntityParameterSpecification> parameters, IList<BinaryData> annotations, DatasetFolder folder, IDictionary<string, BinaryData> additionalProperties, DataFactoryElement<string> path) : base(datasetType, description, structure, schema, linkedServiceName, parameters, annotations, folder, additionalProperties)
+        internal ODataResourceDataset(string datasetType, string description, DataFactoryElement<IList<DatasetDataElement>> structure, DataFactoryElement<IList<DatasetSchemaDataElement>> schema, DataFactoryLinkedServiceReference linkedServiceName, IDictionary<string, EntityParameterSpecification> parameters, IList<BinaryData> annotations, DatasetFolder folder, IDictionary<string, DataFactoryElement<string>> additionalProperties, DataFactoryElement<string> path) : base(datasetType, description, structure, schema, linkedServiceName, parameters, annotations, folder, additionalProperties)
         {
             Path = path;
             DatasetType = datasetType ?? "ODataResource";
diff --git a/src/AzureDataFactory.TestingFramework/Generated/Models/ODataSource.Serialization.cs b/src/AzureDataFactory.TestingFramework/Generated/Models/ODataSource.Serialization.cs
index c68263e5..2b2e39c5 100644
--- a/src/AzureDataFactory.TestingFramework/Generated/Models/ODataSource.Serialization.cs
+++ b/src/AzureDataFactory.TestingFramework/Generated/Models/ODataSource.Serialization.cs
@@ -83,8 +83,8 @@ internal static ODataSource DeserializeODataSource(JsonElement element)
             Optional<DataFactoryElement<string>> sourceRetryWait = default;
             Optional<DataFactoryElement<int>> maxConcurrentConnections = default;
             Optional<DataFactoryElement<bool>> disableMetricsCollection = default;
-            IDictionary<string, BinaryData> additionalProperties = default;
-            Dictionary<string, BinaryData> additionalPropertiesDictionary = new Dictionary<string, BinaryData>();
+            IDictionary<string, DataFactoryElement<string>> additionalProperties = default;
+            Dictionary<string, DataFactoryElement<string>> additionalPropertiesDictionary = new Dictionary<string, DataFactoryElement<string>>();
             foreach (var property in element.EnumerateObject())
             {
                 if (property.NameEquals("query"u8))
@@ -155,7 +155,7 @@ internal static ODataSource DeserializeODataSource(JsonElement element)
                     disableMetricsCollection = JsonSerializer.Deserialize<DataFactoryElement<bool>>(property.Value.GetRawText());
                     continue;
                 }
-                additionalPropertiesDictionary.Add(property.Name, BinaryData.FromString(property.Value.GetRawText()));
+                additionalPropertiesDictionary.Add(property.Name, JsonSerializer.Deserialize<DataFactoryElement<string>>(property.Value.GetRawText()));
             }
             additionalProperties = additionalPropertiesDictionary;
             return new ODataSource(type, sourceRetryCount.Value, sourceRetryWait.Value, maxConcurrentConnections.Value, disableMetricsCollection.Value, additionalProperties, query.Value, httpRequestTimeout.Value, additionalColumns.Value);
diff --git a/src/AzureDataFactory.TestingFramework/Generated/Models/ODataSource.cs b/src/AzureDataFactory.TestingFramework/Generated/Models/ODataSource.cs
index 40a8192d..fd032f0e 100644
--- a/src/AzureDataFactory.TestingFramework/Generated/Models/ODataSource.cs
+++ b/src/AzureDataFactory.TestingFramework/Generated/Models/ODataSource.cs
@@ -28,7 +28,7 @@ public ODataSource()
         /// <param name="query"> OData query. For example, "$top=1". Type: string (or Expression with resultType string). </param>
         /// <param name="httpRequestTimeout"> The timeout (TimeSpan) to get an HTTP response. It is the timeout to get a response, not the timeout to read response data. Default value: 00:05:00. Type: string (or Expression with resultType string), pattern: ((\d+)\.)?(\d\d):(60|([0-5][0-9])):(60|([0-5][0-9])). </param>
         /// <param name="additionalColumns"> Specifies the additional columns to be added to source data. Type: array of objects(AdditionalColumns) (or Expression with resultType array of objects). </param>
-        internal ODataSource(string copySourceType, DataFactoryElement<int> sourceRetryCount, DataFactoryElement<string> sourceRetryWait, DataFactoryElement<int> maxConcurrentConnections, DataFactoryElement<bool> disableMetricsCollection, IDictionary<string, BinaryData> additionalProperties, DataFactoryElement<string> query, DataFactoryElement<string> httpRequestTimeout, BinaryData additionalColumns) : base(copySourceType, sourceRetryCount, sourceRetryWait, maxConcurrentConnections, disableMetricsCollection, additionalProperties)
+        internal ODataSource(string copySourceType, DataFactoryElement<int> sourceRetryCount, DataFactoryElement<string> sourceRetryWait, DataFactoryElement<int> maxConcurrentConnections, DataFactoryElement<bool> disableMetricsCollection, IDictionary<string, DataFactoryElement<string>> additionalProperties, DataFactoryElement<string> query, DataFactoryElement<string> httpRequestTimeout, BinaryData additionalColumns) : base(copySourceType, sourceRetryCount, sourceRetryWait, maxConcurrentConnections, disableMetricsCollection, additionalProperties)
         {
             Query = query;
             HttpRequestTimeout = httpRequestTimeout;
diff --git a/src/AzureDataFactory.TestingFramework/Generated/Models/OdbcLinkedService.Serialization.cs b/src/AzureDataFactory.TestingFramework/Generated/Models/OdbcLinkedService.Serialization.cs
index ddcb6bed..4cc3b2e9 100644
--- a/src/AzureDataFactory.TestingFramework/Generated/Models/OdbcLinkedService.Serialization.cs
+++ b/src/AzureDataFactory.TestingFramework/Generated/Models/OdbcLinkedService.Serialization.cs
@@ -117,8 +117,8 @@ internal static OdbcLinkedService DeserializeOdbcLinkedService(JsonElement eleme
             Optional<DataFactoryElement<string>> userName = default;
             Optional<DataFactorySecretBaseDefinition> password = default;
             Optional<string> encryptedCredential = default;
-            IDictionary<string, BinaryData> additionalProperties = default;
-            Dictionary<string, BinaryData> additionalPropertiesDictionary = new Dictionary<string, BinaryData>();
+            IDictionary<string, DataFactoryElement<string>> additionalProperties = default;
+            Dictionary<string, DataFactoryElement<string>> additionalPropertiesDictionary = new Dictionary<string, DataFactoryElement<string>>();
             foreach (var property in element.EnumerateObject())
             {
                 if (property.NameEquals("type"u8))
@@ -233,7 +233,7 @@ internal static OdbcLinkedService DeserializeOdbcLinkedService(JsonElement eleme
                     }
                     continue;
                 }
-                additionalPropertiesDictionary.Add(property.Name, BinaryData.FromString(property.Value.GetRawText()));
+                additionalPropertiesDictionary.Add(property.Name, JsonSerializer.Deserialize<DataFactoryElement<string>>(property.Value.GetRawText()));
             }
             additionalProperties = additionalPropertiesDictionary;
             return new OdbcLinkedService(type, connectVia.Value, description.Value, Optional.ToDictionary(parameters), Optional.ToList(annotations), additionalProperties, connectionString, authenticationType.Value, credential, userName.Value, password, encryptedCredential.Value);
diff --git a/src/AzureDataFactory.TestingFramework/Generated/Models/OdbcLinkedService.cs b/src/AzureDataFactory.TestingFramework/Generated/Models/OdbcLinkedService.cs
index ac62aa93..30c2d199 100644
--- a/src/AzureDataFactory.TestingFramework/Generated/Models/OdbcLinkedService.cs
+++ b/src/AzureDataFactory.TestingFramework/Generated/Models/OdbcLinkedService.cs
@@ -37,7 +37,7 @@ public OdbcLinkedService(DataFactoryElement<string> connectionString)
         /// <param name="userName"> User name for Basic authentication. Type: string (or Expression with resultType string). </param>
         /// <param name="password"> Password for Basic authentication. </param>
         /// <param name="encryptedCredential"> The encrypted credential used for authentication. Credentials are encrypted using the integration runtime credential manager. Type: string. </param>
-        internal OdbcLinkedService(string linkedServiceType, IntegrationRuntimeReference connectVia, string description, IDictionary<string, EntityParameterSpecification> parameters, IList<BinaryData> annotations, IDictionary<string, BinaryData> additionalProperties, DataFactoryElement<string> connectionString, DataFactoryElement<string> authenticationType, DataFactorySecretBaseDefinition credential, DataFactoryElement<string> userName, DataFactorySecretBaseDefinition password, string encryptedCredential) : base(linkedServiceType, connectVia, description, parameters, annotations, additionalProperties)
+        internal OdbcLinkedService(string linkedServiceType, IntegrationRuntimeReference connectVia, string description, IDictionary<string, EntityParameterSpecification> parameters, IList<BinaryData> annotations, IDictionary<string, DataFactoryElement<string>> additionalProperties, DataFactoryElement<string> connectionString, DataFactoryElement<string> authenticationType, DataFactorySecretBaseDefinition credential, DataFactoryElement<string> userName, DataFactorySecretBaseDefinition password, string encryptedCredential) : base(linkedServiceType, connectVia, description, parameters, annotations, additionalProperties)
         {
             ConnectionString = connectionString;
             AuthenticationType = authenticationType;
diff --git a/src/AzureDataFactory.TestingFramework/Generated/Models/OdbcSink.Serialization.cs b/src/AzureDataFactory.TestingFramework/Generated/Models/OdbcSink.Serialization.cs
index 813367a6..8803bbe1 100644
--- a/src/AzureDataFactory.TestingFramework/Generated/Models/OdbcSink.Serialization.cs
+++ b/src/AzureDataFactory.TestingFramework/Generated/Models/OdbcSink.Serialization.cs
@@ -79,8 +79,8 @@ internal static OdbcSink DeserializeOdbcSink(JsonElement element)
             Optional<DataFactoryElement<string>> sinkRetryWait = default;
             Optional<DataFactoryElement<int>> maxConcurrentConnections = default;
             Optional<DataFactoryElement<bool>> disableMetricsCollection = default;
-            IDictionary<string, BinaryData> additionalProperties = default;
-            Dictionary<string, BinaryData> additionalPropertiesDictionary = new Dictionary<string, BinaryData>();
+            IDictionary<string, DataFactoryElement<string>> additionalProperties = default;
+            Dictionary<string, DataFactoryElement<string>> additionalPropertiesDictionary = new Dictionary<string, DataFactoryElement<string>>();
             foreach (var property in element.EnumerateObject())
             {
                 if (property.NameEquals("preCopyScript"u8))
@@ -151,7 +151,7 @@ internal static OdbcSink DeserializeOdbcSink(JsonElement element)
                     disableMetricsCollection = JsonSerializer.Deserialize<DataFactoryElement<bool>>(property.Value.GetRawText());
                     continue;
                 }
-                additionalPropertiesDictionary.Add(property.Name, BinaryData.FromString(property.Value.GetRawText()));
+                additionalPropertiesDictionary.Add(property.Name, JsonSerializer.Deserialize<DataFactoryElement<string>>(property.Value.GetRawText()));
             }
             additionalProperties = additionalPropertiesDictionary;
             return new OdbcSink(type, writeBatchSize.Value, writeBatchTimeout.Value, sinkRetryCount.Value, sinkRetryWait.Value, maxConcurrentConnections.Value, disableMetricsCollection.Value, additionalProperties, preCopyScript.Value);
diff --git a/src/AzureDataFactory.TestingFramework/Generated/Models/OdbcSink.cs b/src/AzureDataFactory.TestingFramework/Generated/Models/OdbcSink.cs
index 79e5e9bb..44bfcf35 100644
--- a/src/AzureDataFactory.TestingFramework/Generated/Models/OdbcSink.cs
+++ b/src/AzureDataFactory.TestingFramework/Generated/Models/OdbcSink.cs
@@ -28,7 +28,7 @@ public OdbcSink()
         /// <param name="disableMetricsCollection"> If true, disable data store metrics collection. Default is false. Type: boolean (or Expression with resultType boolean). </param>
         /// <param name="additionalProperties"> Additional Properties. </param>
         /// <param name="preCopyScript"> A query to execute before starting the copy. Type: string (or Expression with resultType string). </param>
-        internal OdbcSink(string copySinkType, DataFactoryElement<int> writeBatchSize, DataFactoryElement<string> writeBatchTimeout, DataFactoryElement<int> sinkRetryCount, DataFactoryElement<string> sinkRetryWait, DataFactoryElement<int> maxConcurrentConnections, DataFactoryElement<bool> disableMetricsCollection, IDictionary<string, BinaryData> additionalProperties, DataFactoryElement<string> preCopyScript) : base(copySinkType, writeBatchSize, writeBatchTimeout, sinkRetryCount, sinkRetryWait, maxConcurrentConnections, disableMetricsCollection, additionalProperties)
+        internal OdbcSink(string copySinkType, DataFactoryElement<int> writeBatchSize, DataFactoryElement<string> writeBatchTimeout, DataFactoryElement<int> sinkRetryCount, DataFactoryElement<string> sinkRetryWait, DataFactoryElement<int> maxConcurrentConnections, DataFactoryElement<bool> disableMetricsCollection, IDictionary<string, DataFactoryElement<string>> additionalProperties, DataFactoryElement<string> preCopyScript) : base(copySinkType, writeBatchSize, writeBatchTimeout, sinkRetryCount, sinkRetryWait, maxConcurrentConnections, disableMetricsCollection, additionalProperties)
         {
             PreCopyScript = preCopyScript;
             CopySinkType = copySinkType ?? "OdbcSink";
diff --git a/src/AzureDataFactory.TestingFramework/Generated/Models/OdbcSource.Serialization.cs b/src/AzureDataFactory.TestingFramework/Generated/Models/OdbcSource.Serialization.cs
index af36aabb..64d3b905 100644
--- a/src/AzureDataFactory.TestingFramework/Generated/Models/OdbcSource.Serialization.cs
+++ b/src/AzureDataFactory.TestingFramework/Generated/Models/OdbcSource.Serialization.cs
@@ -83,8 +83,8 @@ internal static OdbcSource DeserializeOdbcSource(JsonElement element)
             Optional<DataFactoryElement<string>> sourceRetryWait = default;
             Optional<DataFactoryElement<int>> maxConcurrentConnections = default;
             Optional<DataFactoryElement<bool>> disableMetricsCollection = default;
-            IDictionary<string, BinaryData> additionalProperties = default;
-            Dictionary<string, BinaryData> additionalPropertiesDictionary = new Dictionary<string, BinaryData>();
+            IDictionary<string, DataFactoryElement<string>> additionalProperties = default;
+            Dictionary<string, DataFactoryElement<string>> additionalPropertiesDictionary = new Dictionary<string, DataFactoryElement<string>>();
             foreach (var property in element.EnumerateObject())
             {
                 if (property.NameEquals("query"u8))
@@ -155,7 +155,7 @@ internal static OdbcSource DeserializeOdbcSource(JsonElement element)
                     disableMetricsCollection = JsonSerializer.Deserialize<DataFactoryElement<bool>>(property.Value.GetRawText());
                     continue;
                 }
-                additionalPropertiesDictionary.Add(property.Name, BinaryData.FromString(property.Value.GetRawText()));
+                additionalPropertiesDictionary.Add(property.Name, JsonSerializer.Deserialize<DataFactoryElement<string>>(property.Value.GetRawText()));
             }
             additionalProperties = additionalPropertiesDictionary;
             return new OdbcSource(type, sourceRetryCount.Value, sourceRetryWait.Value, maxConcurrentConnections.Value, disableMetricsCollection.Value, additionalProperties, queryTimeout.Value, additionalColumns.Value, query.Value);
diff --git a/src/AzureDataFactory.TestingFramework/Generated/Models/OdbcSource.cs b/src/AzureDataFactory.TestingFramework/Generated/Models/OdbcSource.cs
index 4c6e0de4..70d7a490 100644
--- a/src/AzureDataFactory.TestingFramework/Generated/Models/OdbcSource.cs
+++ b/src/AzureDataFactory.TestingFramework/Generated/Models/OdbcSource.cs
@@ -28,7 +28,7 @@ public OdbcSource()
         /// <param name="queryTimeout"> Query timeout. Type: string (or Expression with resultType string), pattern: ((\d+)\.)?(\d\d):(60|([0-5][0-9])):(60|([0-5][0-9])). </param>
         /// <param name="additionalColumns"> Specifies the additional columns to be added to source data. Type: array of objects(AdditionalColumns) (or Expression with resultType array of objects). </param>
         /// <param name="query"> Database query. Type: string (or Expression with resultType string). </param>
-        internal OdbcSource(string copySourceType, DataFactoryElement<int> sourceRetryCount, DataFactoryElement<string> sourceRetryWait, DataFactoryElement<int> maxConcurrentConnections, DataFactoryElement<bool> disableMetricsCollection, IDictionary<string, BinaryData> additionalProperties, DataFactoryElement<string> queryTimeout, BinaryData additionalColumns, DataFactoryElement<string> query) : base(copySourceType, sourceRetryCount, sourceRetryWait, maxConcurrentConnections, disableMetricsCollection, additionalProperties, queryTimeout, additionalColumns)
+        internal OdbcSource(string copySourceType, DataFactoryElement<int> sourceRetryCount, DataFactoryElement<string> sourceRetryWait, DataFactoryElement<int> maxConcurrentConnections, DataFactoryElement<bool> disableMetricsCollection, IDictionary<string, DataFactoryElement<string>> additionalProperties, DataFactoryElement<string> queryTimeout, BinaryData additionalColumns, DataFactoryElement<string> query) : base(copySourceType, sourceRetryCount, sourceRetryWait, maxConcurrentConnections, disableMetricsCollection, additionalProperties, queryTimeout, additionalColumns)
         {
             Query = query;
             CopySourceType = copySourceType ?? "OdbcSource";
diff --git a/src/AzureDataFactory.TestingFramework/Generated/Models/OdbcTableDataset.Serialization.cs b/src/AzureDataFactory.TestingFramework/Generated/Models/OdbcTableDataset.Serialization.cs
index 36da18ea..6c4d14a8 100644
--- a/src/AzureDataFactory.TestingFramework/Generated/Models/OdbcTableDataset.Serialization.cs
+++ b/src/AzureDataFactory.TestingFramework/Generated/Models/OdbcTableDataset.Serialization.cs
@@ -104,8 +104,8 @@ internal static OdbcTableDataset DeserializeOdbcTableDataset(JsonElement element
             Optional<IList<BinaryData>> annotations = default;
             Optional<DatasetFolder> folder = default;
             Optional<DataFactoryElement<string>> tableName = default;
-            IDictionary<string, BinaryData> additionalProperties = default;
-            Dictionary<string, BinaryData> additionalPropertiesDictionary = new Dictionary<string, BinaryData>();
+            IDictionary<string, DataFactoryElement<string>> additionalProperties = default;
+            Dictionary<string, DataFactoryElement<string>> additionalPropertiesDictionary = new Dictionary<string, DataFactoryElement<string>>();
             foreach (var property in element.EnumerateObject())
             {
                 if (property.NameEquals("type"u8))
@@ -206,7 +206,7 @@ internal static OdbcTableDataset DeserializeOdbcTableDataset(JsonElement element
                     }
                     continue;
                 }
-                additionalPropertiesDictionary.Add(property.Name, BinaryData.FromString(property.Value.GetRawText()));
+                additionalPropertiesDictionary.Add(property.Name, JsonSerializer.Deserialize<DataFactoryElement<string>>(property.Value.GetRawText()));
             }
             additionalProperties = additionalPropertiesDictionary;
             return new OdbcTableDataset(type, description.Value, structure.Value, schema.Value, linkedServiceName, Optional.ToDictionary(parameters), Optional.ToList(annotations), folder.Value, additionalProperties, tableName.Value);
diff --git a/src/AzureDataFactory.TestingFramework/Generated/Models/OdbcTableDataset.cs b/src/AzureDataFactory.TestingFramework/Generated/Models/OdbcTableDataset.cs
index 0b0c835d..74eec4e1 100644
--- a/src/AzureDataFactory.TestingFramework/Generated/Models/OdbcTableDataset.cs
+++ b/src/AzureDataFactory.TestingFramework/Generated/Models/OdbcTableDataset.cs
@@ -34,7 +34,7 @@ public OdbcTableDataset(DataFactoryLinkedServiceReference linkedServiceName) : b
         /// <param name="folder"> The folder that this Dataset is in. If not specified, Dataset will appear at the root level. </param>
         /// <param name="additionalProperties"> Additional Properties. </param>
         /// <param name="tableName"> The ODBC table name. Type: string (or Expression with resultType string). </param>
-        internal OdbcTableDataset(string datasetType, string description, DataFactoryElement<IList<DatasetDataElement>> structure, DataFactoryElement<IList<DatasetSchemaDataElement>> schema, DataFactoryLinkedServiceReference linkedServiceName, IDictionary<string, EntityParameterSpecification> parameters, IList<BinaryData> annotations, DatasetFolder folder, IDictionary<string, BinaryData> additionalProperties, DataFactoryElement<string> tableName) : base(datasetType, description, structure, schema, linkedServiceName, parameters, annotations, folder, additionalProperties)
+        internal OdbcTableDataset(string datasetType, string description, DataFactoryElement<IList<DatasetDataElement>> structure, DataFactoryElement<IList<DatasetSchemaDataElement>> schema, DataFactoryLinkedServiceReference linkedServiceName, IDictionary<string, EntityParameterSpecification> parameters, IList<BinaryData> annotations, DatasetFolder folder, IDictionary<string, DataFactoryElement<string>> additionalProperties, DataFactoryElement<string> tableName) : base(datasetType, description, structure, schema, linkedServiceName, parameters, annotations, folder, additionalProperties)
         {
             TableName = tableName;
             DatasetType = datasetType ?? "OdbcTable";
diff --git a/src/AzureDataFactory.TestingFramework/Generated/Models/Office365Dataset.Serialization.cs b/src/AzureDataFactory.TestingFramework/Generated/Models/Office365Dataset.Serialization.cs
index 144a792b..fcd0f9e6 100644
--- a/src/AzureDataFactory.TestingFramework/Generated/Models/Office365Dataset.Serialization.cs
+++ b/src/AzureDataFactory.TestingFramework/Generated/Models/Office365Dataset.Serialization.cs
@@ -107,8 +107,8 @@ internal static Office365Dataset DeserializeOffice365Dataset(JsonElement element
             Optional<DatasetFolder> folder = default;
             DataFactoryElement<string> tableName = default;
             Optional<DataFactoryElement<string>> predicate = default;
-            IDictionary<string, BinaryData> additionalProperties = default;
-            Dictionary<string, BinaryData> additionalPropertiesDictionary = new Dictionary<string, BinaryData>();
+            IDictionary<string, DataFactoryElement<string>> additionalProperties = default;
+            Dictionary<string, DataFactoryElement<string>> additionalPropertiesDictionary = new Dictionary<string, DataFactoryElement<string>>();
             foreach (var property in element.EnumerateObject())
             {
                 if (property.NameEquals("type"u8))
@@ -214,7 +214,7 @@ internal static Office365Dataset DeserializeOffice365Dataset(JsonElement element
                     }
                     continue;
                 }
-                additionalPropertiesDictionary.Add(property.Name, BinaryData.FromString(property.Value.GetRawText()));
+                additionalPropertiesDictionary.Add(property.Name, JsonSerializer.Deserialize<DataFactoryElement<string>>(property.Value.GetRawText()));
             }
             additionalProperties = additionalPropertiesDictionary;
             return new Office365Dataset(type, description.Value, structure.Value, schema.Value, linkedServiceName, Optional.ToDictionary(parameters), Optional.ToList(annotations), folder.Value, additionalProperties, tableName, predicate.Value);
diff --git a/src/AzureDataFactory.TestingFramework/Generated/Models/Office365Dataset.cs b/src/AzureDataFactory.TestingFramework/Generated/Models/Office365Dataset.cs
index 773021b7..ff9e9bbf 100644
--- a/src/AzureDataFactory.TestingFramework/Generated/Models/Office365Dataset.cs
+++ b/src/AzureDataFactory.TestingFramework/Generated/Models/Office365Dataset.cs
@@ -38,7 +38,7 @@ public Office365Dataset(DataFactoryLinkedServiceReference linkedServiceName, Dat
         /// <param name="additionalProperties"> Additional Properties. </param>
         /// <param name="tableName"> Name of the dataset to extract from Office 365. Type: string (or Expression with resultType string). </param>
         /// <param name="predicate"> A predicate expression that can be used to filter the specific rows to extract from Office 365. Type: string (or Expression with resultType string). </param>
-        internal Office365Dataset(string datasetType, string description, DataFactoryElement<IList<DatasetDataElement>> structure, DataFactoryElement<IList<DatasetSchemaDataElement>> schema, DataFactoryLinkedServiceReference linkedServiceName, IDictionary<string, EntityParameterSpecification> parameters, IList<BinaryData> annotations, DatasetFolder folder, IDictionary<string, BinaryData> additionalProperties, DataFactoryElement<string> tableName, DataFactoryElement<string> predicate) : base(datasetType, description, structure, schema, linkedServiceName, parameters, annotations, folder, additionalProperties)
+        internal Office365Dataset(string datasetType, string description, DataFactoryElement<IList<DatasetDataElement>> structure, DataFactoryElement<IList<DatasetSchemaDataElement>> schema, DataFactoryLinkedServiceReference linkedServiceName, IDictionary<string, EntityParameterSpecification> parameters, IList<BinaryData> annotations, DatasetFolder folder, IDictionary<string, DataFactoryElement<string>> additionalProperties, DataFactoryElement<string> tableName, DataFactoryElement<string> predicate) : base(datasetType, description, structure, schema, linkedServiceName, parameters, annotations, folder, additionalProperties)
         {
             TableName = tableName;
             Predicate = predicate;
diff --git a/src/AzureDataFactory.TestingFramework/Generated/Models/Office365LinkedService.Serialization.cs b/src/AzureDataFactory.TestingFramework/Generated/Models/Office365LinkedService.Serialization.cs
index fbdbdc83..1d33c0d0 100644
--- a/src/AzureDataFactory.TestingFramework/Generated/Models/Office365LinkedService.Serialization.cs
+++ b/src/AzureDataFactory.TestingFramework/Generated/Models/Office365LinkedService.Serialization.cs
@@ -101,8 +101,8 @@ internal static Office365LinkedService DeserializeOffice365LinkedService(JsonEle
             DataFactoryElement<string> servicePrincipalId = default;
             DataFactorySecretBaseDefinition servicePrincipalKey = default;
             Optional<string> encryptedCredential = default;
-            IDictionary<string, BinaryData> additionalProperties = default;
-            Dictionary<string, BinaryData> additionalPropertiesDictionary = new Dictionary<string, BinaryData>();
+            IDictionary<string, DataFactoryElement<string>> additionalProperties = default;
+            Dictionary<string, DataFactoryElement<string>> additionalPropertiesDictionary = new Dictionary<string, DataFactoryElement<string>>();
             foreach (var property in element.EnumerateObject())
             {
                 if (property.NameEquals("type"u8))
@@ -196,7 +196,7 @@ internal static Office365LinkedService DeserializeOffice365LinkedService(JsonEle
                     }
                     continue;
                 }
-                additionalPropertiesDictionary.Add(property.Name, BinaryData.FromString(property.Value.GetRawText()));
+                additionalPropertiesDictionary.Add(property.Name, JsonSerializer.Deserialize<DataFactoryElement<string>>(property.Value.GetRawText()));
             }
             additionalProperties = additionalPropertiesDictionary;
             return new Office365LinkedService(type, connectVia.Value, description.Value, Optional.ToDictionary(parameters), Optional.ToList(annotations), additionalProperties, office365TenantId, servicePrincipalTenantId, servicePrincipalId, servicePrincipalKey, encryptedCredential.Value);
diff --git a/src/AzureDataFactory.TestingFramework/Generated/Models/Office365LinkedService.cs b/src/AzureDataFactory.TestingFramework/Generated/Models/Office365LinkedService.cs
index ceb0df28..cd6d1fc0 100644
--- a/src/AzureDataFactory.TestingFramework/Generated/Models/Office365LinkedService.cs
+++ b/src/AzureDataFactory.TestingFramework/Generated/Models/Office365LinkedService.cs
@@ -45,7 +45,7 @@ public Office365LinkedService(DataFactoryElement<string> office365TenantId, Data
         /// <param name="servicePrincipalId"> Specify the application's client ID. Type: string (or Expression with resultType string). </param>
         /// <param name="servicePrincipalKey"> Specify the application's key. </param>
         /// <param name="encryptedCredential"> The encrypted credential used for authentication. Credentials are encrypted using the integration runtime credential manager. Type: string. </param>
-        internal Office365LinkedService(string linkedServiceType, IntegrationRuntimeReference connectVia, string description, IDictionary<string, EntityParameterSpecification> parameters, IList<BinaryData> annotations, IDictionary<string, BinaryData> additionalProperties, DataFactoryElement<string> office365TenantId, DataFactoryElement<string> servicePrincipalTenantId, DataFactoryElement<string> servicePrincipalId, DataFactorySecretBaseDefinition servicePrincipalKey, string encryptedCredential) : base(linkedServiceType, connectVia, description, parameters, annotations, additionalProperties)
+        internal Office365LinkedService(string linkedServiceType, IntegrationRuntimeReference connectVia, string description, IDictionary<string, EntityParameterSpecification> parameters, IList<BinaryData> annotations, IDictionary<string, DataFactoryElement<string>> additionalProperties, DataFactoryElement<string> office365TenantId, DataFactoryElement<string> servicePrincipalTenantId, DataFactoryElement<string> servicePrincipalId, DataFactorySecretBaseDefinition servicePrincipalKey, string encryptedCredential) : base(linkedServiceType, connectVia, description, parameters, annotations, additionalProperties)
         {
             Office365TenantId = office365TenantId;
             ServicePrincipalTenantId = servicePrincipalTenantId;
diff --git a/src/AzureDataFactory.TestingFramework/Generated/Models/Office365Source.Serialization.cs b/src/AzureDataFactory.TestingFramework/Generated/Models/Office365Source.Serialization.cs
index 988331b7..70b17971 100644
--- a/src/AzureDataFactory.TestingFramework/Generated/Models/Office365Source.Serialization.cs
+++ b/src/AzureDataFactory.TestingFramework/Generated/Models/Office365Source.Serialization.cs
@@ -97,8 +97,8 @@ internal static Office365Source DeserializeOffice365Source(JsonElement element)
             Optional<DataFactoryElement<string>> sourceRetryWait = default;
             Optional<DataFactoryElement<int>> maxConcurrentConnections = default;
             Optional<DataFactoryElement<bool>> disableMetricsCollection = default;
-            IDictionary<string, BinaryData> additionalProperties = default;
-            Dictionary<string, BinaryData> additionalPropertiesDictionary = new Dictionary<string, BinaryData>();
+            IDictionary<string, DataFactoryElement<string>> additionalProperties = default;
+            Dictionary<string, DataFactoryElement<string>> additionalPropertiesDictionary = new Dictionary<string, DataFactoryElement<string>>();
             foreach (var property in element.EnumerateObject())
             {
                 if (property.NameEquals("allowedGroups"u8))
@@ -196,7 +196,7 @@ internal static Office365Source DeserializeOffice365Source(JsonElement element)
                     disableMetricsCollection = JsonSerializer.Deserialize<DataFactoryElement<bool>>(property.Value.GetRawText());
                     continue;
                 }
-                additionalPropertiesDictionary.Add(property.Name, BinaryData.FromString(property.Value.GetRawText()));
+                additionalPropertiesDictionary.Add(property.Name, JsonSerializer.Deserialize<DataFactoryElement<string>>(property.Value.GetRawText()));
             }
             additionalProperties = additionalPropertiesDictionary;
             return new Office365Source(type, sourceRetryCount.Value, sourceRetryWait.Value, maxConcurrentConnections.Value, disableMetricsCollection.Value, additionalProperties, allowedGroups.Value, userScopeFilterUri.Value, dateFilterColumn.Value, startTime.Value, endTime.Value, outputColumns.Value);
diff --git a/src/AzureDataFactory.TestingFramework/Generated/Models/Office365Source.cs b/src/AzureDataFactory.TestingFramework/Generated/Models/Office365Source.cs
index 8e792e8b..ea2da318 100644
--- a/src/AzureDataFactory.TestingFramework/Generated/Models/Office365Source.cs
+++ b/src/AzureDataFactory.TestingFramework/Generated/Models/Office365Source.cs
@@ -31,7 +31,7 @@ public Office365Source()
         /// <param name="startOn"> Start time of the requested range for this dataset. Type: string (or Expression with resultType string). </param>
         /// <param name="endOn"> End time of the requested range for this dataset. Type: string (or Expression with resultType string). </param>
         /// <param name="outputColumns"> The columns to be read out from the Office 365 table. Type: array of objects (or Expression with resultType array of objects). itemType: OutputColumn. Example: [ { "name": "Id" }, { "name": "CreatedDateTime" } ]. </param>
-        internal Office365Source(string copySourceType, DataFactoryElement<int> sourceRetryCount, DataFactoryElement<string> sourceRetryWait, DataFactoryElement<int> maxConcurrentConnections, DataFactoryElement<bool> disableMetricsCollection, IDictionary<string, BinaryData> additionalProperties, DataFactoryElement<IList<string>> allowedGroups, DataFactoryElement<string> userScopeFilterUri, DataFactoryElement<string> dateFilterColumn, DataFactoryElement<string> startOn, DataFactoryElement<string> endOn, DataFactoryElement<IList<Office365TableOutputColumn>> outputColumns) : base(copySourceType, sourceRetryCount, sourceRetryWait, maxConcurrentConnections, disableMetricsCollection, additionalProperties)
+        internal Office365Source(string copySourceType, DataFactoryElement<int> sourceRetryCount, DataFactoryElement<string> sourceRetryWait, DataFactoryElement<int> maxConcurrentConnections, DataFactoryElement<bool> disableMetricsCollection, IDictionary<string, DataFactoryElement<string>> additionalProperties, DataFactoryElement<IList<string>> allowedGroups, DataFactoryElement<string> userScopeFilterUri, DataFactoryElement<string> dateFilterColumn, DataFactoryElement<string> startOn, DataFactoryElement<string> endOn, DataFactoryElement<IList<Office365TableOutputColumn>> outputColumns) : base(copySourceType, sourceRetryCount, sourceRetryWait, maxConcurrentConnections, disableMetricsCollection, additionalProperties)
         {
             AllowedGroups = allowedGroups;
             UserScopeFilterUri = userScopeFilterUri;
diff --git a/src/AzureDataFactory.TestingFramework/Generated/Models/OracleCloudStorageLinkedService.Serialization.cs b/src/AzureDataFactory.TestingFramework/Generated/Models/OracleCloudStorageLinkedService.Serialization.cs
index e7d94b5b..1f22c864 100644
--- a/src/AzureDataFactory.TestingFramework/Generated/Models/OracleCloudStorageLinkedService.Serialization.cs
+++ b/src/AzureDataFactory.TestingFramework/Generated/Models/OracleCloudStorageLinkedService.Serialization.cs
@@ -108,8 +108,8 @@ internal static OracleCloudStorageLinkedService DeserializeOracleCloudStorageLin
             Optional<DataFactorySecretBaseDefinition> secretAccessKey = default;
             Optional<DataFactoryElement<string>> serviceUrl = default;
             Optional<string> encryptedCredential = default;
-            IDictionary<string, BinaryData> additionalProperties = default;
-            Dictionary<string, BinaryData> additionalPropertiesDictionary = new Dictionary<string, BinaryData>();
+            IDictionary<string, DataFactoryElement<string>> additionalProperties = default;
+            Dictionary<string, DataFactoryElement<string>> additionalPropertiesDictionary = new Dictionary<string, DataFactoryElement<string>>();
             foreach (var property in element.EnumerateObject())
             {
                 if (property.NameEquals("type"u8))
@@ -210,7 +210,7 @@ internal static OracleCloudStorageLinkedService DeserializeOracleCloudStorageLin
                     }
                     continue;
                 }
-                additionalPropertiesDictionary.Add(property.Name, BinaryData.FromString(property.Value.GetRawText()));
+                additionalPropertiesDictionary.Add(property.Name, JsonSerializer.Deserialize<DataFactoryElement<string>>(property.Value.GetRawText()));
             }
             additionalProperties = additionalPropertiesDictionary;
             return new OracleCloudStorageLinkedService(type, connectVia.Value, description.Value, Optional.ToDictionary(parameters), Optional.ToList(annotations), additionalProperties, accessKeyId.Value, secretAccessKey, serviceUrl.Value, encryptedCredential.Value);
diff --git a/src/AzureDataFactory.TestingFramework/Generated/Models/OracleCloudStorageLinkedService.cs b/src/AzureDataFactory.TestingFramework/Generated/Models/OracleCloudStorageLinkedService.cs
index 0c6c986a..8c1c3937 100644
--- a/src/AzureDataFactory.TestingFramework/Generated/Models/OracleCloudStorageLinkedService.cs
+++ b/src/AzureDataFactory.TestingFramework/Generated/Models/OracleCloudStorageLinkedService.cs
@@ -29,7 +29,7 @@ public OracleCloudStorageLinkedService()
         /// <param name="secretAccessKey"> The secret access key of the Oracle Cloud Storage Identity and Access Management (IAM) user. </param>
         /// <param name="serviceUri"> This value specifies the endpoint to access with the Oracle Cloud Storage Connector. This is an optional property; change it only if you want to try a different service endpoint or want to switch between https and http. Type: string (or Expression with resultType string). </param>
         /// <param name="encryptedCredential"> The encrypted credential used for authentication. Credentials are encrypted using the integration runtime credential manager. Type: string. </param>
-        internal OracleCloudStorageLinkedService(string linkedServiceType, IntegrationRuntimeReference connectVia, string description, IDictionary<string, EntityParameterSpecification> parameters, IList<BinaryData> annotations, IDictionary<string, BinaryData> additionalProperties, DataFactoryElement<string> accessKeyId, DataFactorySecretBaseDefinition secretAccessKey, DataFactoryElement<string> serviceUri, string encryptedCredential) : base(linkedServiceType, connectVia, description, parameters, annotations, additionalProperties)
+        internal OracleCloudStorageLinkedService(string linkedServiceType, IntegrationRuntimeReference connectVia, string description, IDictionary<string, EntityParameterSpecification> parameters, IList<BinaryData> annotations, IDictionary<string, DataFactoryElement<string>> additionalProperties, DataFactoryElement<string> accessKeyId, DataFactorySecretBaseDefinition secretAccessKey, DataFactoryElement<string> serviceUri, string encryptedCredential) : base(linkedServiceType, connectVia, description, parameters, annotations, additionalProperties)
         {
             AccessKeyId = accessKeyId;
             SecretAccessKey = secretAccessKey;
diff --git a/src/AzureDataFactory.TestingFramework/Generated/Models/OracleCloudStorageLocation.Serialization.cs b/src/AzureDataFactory.TestingFramework/Generated/Models/OracleCloudStorageLocation.Serialization.cs
index fadea1eb..7a7aed3b 100644
--- a/src/AzureDataFactory.TestingFramework/Generated/Models/OracleCloudStorageLocation.Serialization.cs
+++ b/src/AzureDataFactory.TestingFramework/Generated/Models/OracleCloudStorageLocation.Serialization.cs
@@ -61,8 +61,8 @@ internal static OracleCloudStorageLocation DeserializeOracleCloudStorageLocation
             string type = default;
             Optional<DataFactoryElement<string>> folderPath = default;
             Optional<DataFactoryElement<string>> fileName = default;
-            IDictionary<string, BinaryData> additionalProperties = default;
-            Dictionary<string, BinaryData> additionalPropertiesDictionary = new Dictionary<string, BinaryData>();
+            IDictionary<string, DataFactoryElement<string>> additionalProperties = default;
+            Dictionary<string, DataFactoryElement<string>> additionalPropertiesDictionary = new Dictionary<string, DataFactoryElement<string>>();
             foreach (var property in element.EnumerateObject())
             {
                 if (property.NameEquals("bucketName"u8))
@@ -106,7 +106,7 @@ internal static OracleCloudStorageLocation DeserializeOracleCloudStorageLocation
                     fileName = JsonSerializer.Deserialize<DataFactoryElement<string>>(property.Value.GetRawText());
                     continue;
                 }
-                additionalPropertiesDictionary.Add(property.Name, BinaryData.FromString(property.Value.GetRawText()));
+                additionalPropertiesDictionary.Add(property.Name, JsonSerializer.Deserialize<DataFactoryElement<string>>(property.Value.GetRawText()));
             }
             additionalProperties = additionalPropertiesDictionary;
             return new OracleCloudStorageLocation(type, folderPath.Value, fileName.Value, additionalProperties, bucketName.Value, version.Value);
diff --git a/src/AzureDataFactory.TestingFramework/Generated/Models/OracleCloudStorageLocation.cs b/src/AzureDataFactory.TestingFramework/Generated/Models/OracleCloudStorageLocation.cs
index def221d3..93b06bee 100644
--- a/src/AzureDataFactory.TestingFramework/Generated/Models/OracleCloudStorageLocation.cs
+++ b/src/AzureDataFactory.TestingFramework/Generated/Models/OracleCloudStorageLocation.cs
@@ -25,7 +25,7 @@ public OracleCloudStorageLocation()
         /// <param name="additionalProperties"> Additional Properties. </param>
         /// <param name="bucketName"> Specify the bucketName of Oracle Cloud Storage. Type: string (or Expression with resultType string). </param>
         /// <param name="version"> Specify the version of Oracle Cloud Storage. Type: string (or Expression with resultType string). </param>
-        internal OracleCloudStorageLocation(string datasetLocationType, DataFactoryElement<string> folderPath, DataFactoryElement<string> fileName, IDictionary<string, BinaryData> additionalProperties, DataFactoryElement<string> bucketName, DataFactoryElement<string> version) : base(datasetLocationType, folderPath, fileName, additionalProperties)
+        internal OracleCloudStorageLocation(string datasetLocationType, DataFactoryElement<string> folderPath, DataFactoryElement<string> fileName, IDictionary<string, DataFactoryElement<string>> additionalProperties, DataFactoryElement<string> bucketName, DataFactoryElement<string> version) : base(datasetLocationType, folderPath, fileName, additionalProperties)
         {
             BucketName = bucketName;
             Version = version;
diff --git a/src/AzureDataFactory.TestingFramework/Generated/Models/OracleCloudStorageReadSettings.Serialization.cs b/src/AzureDataFactory.TestingFramework/Generated/Models/OracleCloudStorageReadSettings.Serialization.cs
index b8e812c7..054c4161 100644
--- a/src/AzureDataFactory.TestingFramework/Generated/Models/OracleCloudStorageReadSettings.Serialization.cs
+++ b/src/AzureDataFactory.TestingFramework/Generated/Models/OracleCloudStorageReadSettings.Serialization.cs
@@ -109,8 +109,8 @@ internal static OracleCloudStorageReadSettings DeserializeOracleCloudStorageRead
             string type = default;
             Optional<DataFactoryElement<int>> maxConcurrentConnections = default;
             Optional<DataFactoryElement<bool>> disableMetricsCollection = default;
-            IDictionary<string, BinaryData> additionalProperties = default;
-            Dictionary<string, BinaryData> additionalPropertiesDictionary = new Dictionary<string, BinaryData>();
+            IDictionary<string, DataFactoryElement<string>> additionalProperties = default;
+            Dictionary<string, DataFactoryElement<string>> additionalPropertiesDictionary = new Dictionary<string, DataFactoryElement<string>>();
             foreach (var property in element.EnumerateObject())
             {
                 if (property.NameEquals("recursive"u8))
@@ -226,7 +226,7 @@ internal static OracleCloudStorageReadSettings DeserializeOracleCloudStorageRead
                     disableMetricsCollection = JsonSerializer.Deserialize<DataFactoryElement<bool>>(property.Value.GetRawText());
                     continue;
                 }
-                additionalPropertiesDictionary.Add(property.Name, BinaryData.FromString(property.Value.GetRawText()));
+                additionalPropertiesDictionary.Add(property.Name, JsonSerializer.Deserialize<DataFactoryElement<string>>(property.Value.GetRawText()));
             }
             additionalProperties = additionalPropertiesDictionary;
             return new OracleCloudStorageReadSettings(type, maxConcurrentConnections.Value, disableMetricsCollection.Value, additionalProperties, recursive.Value, wildcardFolderPath.Value, wildcardFileName.Value, prefix.Value, fileListPath.Value, enablePartitionDiscovery.Value, partitionRootPath.Value, deleteFilesAfterCompletion.Value, modifiedDatetimeStart.Value, modifiedDatetimeEnd.Value);
diff --git a/src/AzureDataFactory.TestingFramework/Generated/Models/OracleCloudStorageReadSettings.cs b/src/AzureDataFactory.TestingFramework/Generated/Models/OracleCloudStorageReadSettings.cs
index 1c058037..f43a138d 100644
--- a/src/AzureDataFactory.TestingFramework/Generated/Models/OracleCloudStorageReadSettings.cs
+++ b/src/AzureDataFactory.TestingFramework/Generated/Models/OracleCloudStorageReadSettings.cs
@@ -33,7 +33,7 @@ public OracleCloudStorageReadSettings()
         /// <param name="deleteFilesAfterCompletion"> Indicates whether the source files need to be deleted after copy completion. Default is false. Type: boolean (or Expression with resultType boolean). </param>
         /// <param name="modifiedDatetimeStart"> The start of file's modified datetime. Type: string (or Expression with resultType string). </param>
         /// <param name="modifiedDatetimeEnd"> The end of file's modified datetime. Type: string (or Expression with resultType string). </param>
-        internal OracleCloudStorageReadSettings(string storeReadSettingsType, DataFactoryElement<int> maxConcurrentConnections, DataFactoryElement<bool> disableMetricsCollection, IDictionary<string, BinaryData> additionalProperties, DataFactoryElement<bool> recursive, DataFactoryElement<string> wildcardFolderPath, DataFactoryElement<string> wildcardFileName, DataFactoryElement<string> prefix, DataFactoryElement<string> fileListPath, DataFactoryElement<bool> enablePartitionDiscovery, DataFactoryElement<string> partitionRootPath, DataFactoryElement<bool> deleteFilesAfterCompletion, DataFactoryElement<string> modifiedDatetimeStart, DataFactoryElement<string> modifiedDatetimeEnd) : base(storeReadSettingsType, maxConcurrentConnections, disableMetricsCollection, additionalProperties)
+        internal OracleCloudStorageReadSettings(string storeReadSettingsType, DataFactoryElement<int> maxConcurrentConnections, DataFactoryElement<bool> disableMetricsCollection, IDictionary<string, DataFactoryElement<string>> additionalProperties, DataFactoryElement<bool> recursive, DataFactoryElement<string> wildcardFolderPath, DataFactoryElement<string> wildcardFileName, DataFactoryElement<string> prefix, DataFactoryElement<string> fileListPath, DataFactoryElement<bool> enablePartitionDiscovery, DataFactoryElement<string> partitionRootPath, DataFactoryElement<bool> deleteFilesAfterCompletion, DataFactoryElement<string> modifiedDatetimeStart, DataFactoryElement<string> modifiedDatetimeEnd) : base(storeReadSettingsType, maxConcurrentConnections, disableMetricsCollection, additionalProperties)
         {
             Recursive = recursive;
             WildcardFolderPath = wildcardFolderPath;
diff --git a/src/AzureDataFactory.TestingFramework/Generated/Models/OracleLinkedService.Serialization.cs b/src/AzureDataFactory.TestingFramework/Generated/Models/OracleLinkedService.Serialization.cs
index 468f7fc5..5023a787 100644
--- a/src/AzureDataFactory.TestingFramework/Generated/Models/OracleLinkedService.Serialization.cs
+++ b/src/AzureDataFactory.TestingFramework/Generated/Models/OracleLinkedService.Serialization.cs
@@ -99,8 +99,8 @@ internal static OracleLinkedService DeserializeOracleLinkedService(JsonElement e
             DataFactoryElement<string> connectionString = default;
             Optional<DataFactoryKeyVaultSecretReference> password = default;
             Optional<string> encryptedCredential = default;
-            IDictionary<string, BinaryData> additionalProperties = default;
-            Dictionary<string, BinaryData> additionalPropertiesDictionary = new Dictionary<string, BinaryData>();
+            IDictionary<string, DataFactoryElement<string>> additionalProperties = default;
+            Dictionary<string, DataFactoryElement<string>> additionalPropertiesDictionary = new Dictionary<string, DataFactoryElement<string>>();
             foreach (var property in element.EnumerateObject())
             {
                 if (property.NameEquals("type"u8))
@@ -188,7 +188,7 @@ internal static OracleLinkedService DeserializeOracleLinkedService(JsonElement e
                     }
                     continue;
                 }
-                additionalPropertiesDictionary.Add(property.Name, BinaryData.FromString(property.Value.GetRawText()));
+                additionalPropertiesDictionary.Add(property.Name, JsonSerializer.Deserialize<DataFactoryElement<string>>(property.Value.GetRawText()));
             }
             additionalProperties = additionalPropertiesDictionary;
             return new OracleLinkedService(type, connectVia.Value, description.Value, Optional.ToDictionary(parameters), Optional.ToList(annotations), additionalProperties, connectionString, password, encryptedCredential.Value);
diff --git a/src/AzureDataFactory.TestingFramework/Generated/Models/OracleLinkedService.cs b/src/AzureDataFactory.TestingFramework/Generated/Models/OracleLinkedService.cs
index f9c5a363..a4a88651 100644
--- a/src/AzureDataFactory.TestingFramework/Generated/Models/OracleLinkedService.cs
+++ b/src/AzureDataFactory.TestingFramework/Generated/Models/OracleLinkedService.cs
@@ -34,7 +34,7 @@ public OracleLinkedService(DataFactoryElement<string> connectionString)
         /// <param name="connectionString"> The connection string. Type: string, SecureString or AzureKeyVaultSecretReference. </param>
         /// <param name="password"> The Azure key vault secret reference of password in connection string. </param>
         /// <param name="encryptedCredential"> The encrypted credential used for authentication. Credentials are encrypted using the integration runtime credential manager. Type: string. </param>
-        internal OracleLinkedService(string linkedServiceType, IntegrationRuntimeReference connectVia, string description, IDictionary<string, EntityParameterSpecification> parameters, IList<BinaryData> annotations, IDictionary<string, BinaryData> additionalProperties, DataFactoryElement<string> connectionString, DataFactoryKeyVaultSecretReference password, string encryptedCredential) : base(linkedServiceType, connectVia, description, parameters, annotations, additionalProperties)
+        internal OracleLinkedService(string linkedServiceType, IntegrationRuntimeReference connectVia, string description, IDictionary<string, EntityParameterSpecification> parameters, IList<BinaryData> annotations, IDictionary<string, DataFactoryElement<string>> additionalProperties, DataFactoryElement<string> connectionString, DataFactoryKeyVaultSecretReference password, string encryptedCredential) : base(linkedServiceType, connectVia, description, parameters, annotations, additionalProperties)
         {
             ConnectionString = connectionString;
             Password = password;
diff --git a/src/AzureDataFactory.TestingFramework/Generated/Models/OracleServiceCloudLinkedService.Serialization.cs b/src/AzureDataFactory.TestingFramework/Generated/Models/OracleServiceCloudLinkedService.Serialization.cs
index 746f66f6..5fdaef96 100644
--- a/src/AzureDataFactory.TestingFramework/Generated/Models/OracleServiceCloudLinkedService.Serialization.cs
+++ b/src/AzureDataFactory.TestingFramework/Generated/Models/OracleServiceCloudLinkedService.Serialization.cs
@@ -124,8 +124,8 @@ internal static OracleServiceCloudLinkedService DeserializeOracleServiceCloudLin
             Optional<DataFactoryElement<bool>> useHostVerification = default;
             Optional<DataFactoryElement<bool>> usePeerVerification = default;
             Optional<string> encryptedCredential = default;
-            IDictionary<string, BinaryData> additionalProperties = default;
-            Dictionary<string, BinaryData> additionalPropertiesDictionary = new Dictionary<string, BinaryData>();
+            IDictionary<string, DataFactoryElement<string>> additionalProperties = default;
+            Dictionary<string, DataFactoryElement<string>> additionalPropertiesDictionary = new Dictionary<string, DataFactoryElement<string>>();
             foreach (var property in element.EnumerateObject())
             {
                 if (property.NameEquals("type"u8))
@@ -241,7 +241,7 @@ internal static OracleServiceCloudLinkedService DeserializeOracleServiceCloudLin
                     }
                     continue;
                 }
-                additionalPropertiesDictionary.Add(property.Name, BinaryData.FromString(property.Value.GetRawText()));
+                additionalPropertiesDictionary.Add(property.Name, JsonSerializer.Deserialize<DataFactoryElement<string>>(property.Value.GetRawText()));
             }
             additionalProperties = additionalPropertiesDictionary;
             return new OracleServiceCloudLinkedService(type, connectVia.Value, description.Value, Optional.ToDictionary(parameters), Optional.ToList(annotations), additionalProperties, host, username, password, useEncryptedEndpoints.Value, useHostVerification.Value, usePeerVerification.Value, encryptedCredential.Value);
diff --git a/src/AzureDataFactory.TestingFramework/Generated/Models/OracleServiceCloudLinkedService.cs b/src/AzureDataFactory.TestingFramework/Generated/Models/OracleServiceCloudLinkedService.cs
index 15515f41..34adab95 100644
--- a/src/AzureDataFactory.TestingFramework/Generated/Models/OracleServiceCloudLinkedService.cs
+++ b/src/AzureDataFactory.TestingFramework/Generated/Models/OracleServiceCloudLinkedService.cs
@@ -44,7 +44,7 @@ public OracleServiceCloudLinkedService(BinaryData host, BinaryData username, Dat
         /// <param name="useHostVerification"> Specifies whether to require the host name in the server's certificate to match the host name of the server when connecting over SSL. The default value is true. Type: boolean (or Expression with resultType boolean). </param>
         /// <param name="usePeerVerification"> Specifies whether to verify the identity of the server when connecting over SSL. The default value is true. Type: boolean (or Expression with resultType boolean). </param>
         /// <param name="encryptedCredential"> The encrypted credential used for authentication. Credentials are encrypted using the integration runtime credential manager. Type: string. </param>
-        internal OracleServiceCloudLinkedService(string linkedServiceType, IntegrationRuntimeReference connectVia, string description, IDictionary<string, EntityParameterSpecification> parameters, IList<BinaryData> annotations, IDictionary<string, BinaryData> additionalProperties, BinaryData host, BinaryData username, DataFactorySecretBaseDefinition password, DataFactoryElement<bool> useEncryptedEndpoints, DataFactoryElement<bool> useHostVerification, DataFactoryElement<bool> usePeerVerification, string encryptedCredential) : base(linkedServiceType, connectVia, description, parameters, annotations, additionalProperties)
+        internal OracleServiceCloudLinkedService(string linkedServiceType, IntegrationRuntimeReference connectVia, string description, IDictionary<string, EntityParameterSpecification> parameters, IList<BinaryData> annotations, IDictionary<string, DataFactoryElement<string>> additionalProperties, BinaryData host, BinaryData username, DataFactorySecretBaseDefinition password, DataFactoryElement<bool> useEncryptedEndpoints, DataFactoryElement<bool> useHostVerification, DataFactoryElement<bool> usePeerVerification, string encryptedCredential) : base(linkedServiceType, connectVia, description, parameters, annotations, additionalProperties)
         {
             Host = host;
             Username = username;
diff --git a/src/AzureDataFactory.TestingFramework/Generated/Models/OracleServiceCloudObjectDataset.Serialization.cs b/src/AzureDataFactory.TestingFramework/Generated/Models/OracleServiceCloudObjectDataset.Serialization.cs
index 8f2b30d9..326a0e1c 100644
--- a/src/AzureDataFactory.TestingFramework/Generated/Models/OracleServiceCloudObjectDataset.Serialization.cs
+++ b/src/AzureDataFactory.TestingFramework/Generated/Models/OracleServiceCloudObjectDataset.Serialization.cs
@@ -104,8 +104,8 @@ internal static OracleServiceCloudObjectDataset DeserializeOracleServiceCloudObj
             Optional<IList<BinaryData>> annotations = default;
             Optional<DatasetFolder> folder = default;
             Optional<DataFactoryElement<string>> tableName = default;
-            IDictionary<string, BinaryData> additionalProperties = default;
-            Dictionary<string, BinaryData> additionalPropertiesDictionary = new Dictionary<string, BinaryData>();
+            IDictionary<string, DataFactoryElement<string>> additionalProperties = default;
+            Dictionary<string, DataFactoryElement<string>> additionalPropertiesDictionary = new Dictionary<string, DataFactoryElement<string>>();
             foreach (var property in element.EnumerateObject())
             {
                 if (property.NameEquals("type"u8))
@@ -206,7 +206,7 @@ internal static OracleServiceCloudObjectDataset DeserializeOracleServiceCloudObj
                     }
                     continue;
                 }
-                additionalPropertiesDictionary.Add(property.Name, BinaryData.FromString(property.Value.GetRawText()));
+                additionalPropertiesDictionary.Add(property.Name, JsonSerializer.Deserialize<DataFactoryElement<string>>(property.Value.GetRawText()));
             }
             additionalProperties = additionalPropertiesDictionary;
             return new OracleServiceCloudObjectDataset(type, description.Value, structure.Value, schema.Value, linkedServiceName, Optional.ToDictionary(parameters), Optional.ToList(annotations), folder.Value, additionalProperties, tableName.Value);
diff --git a/src/AzureDataFactory.TestingFramework/Generated/Models/OracleServiceCloudObjectDataset.cs b/src/AzureDataFactory.TestingFramework/Generated/Models/OracleServiceCloudObjectDataset.cs
index 3de900e3..a0dc8ec8 100644
--- a/src/AzureDataFactory.TestingFramework/Generated/Models/OracleServiceCloudObjectDataset.cs
+++ b/src/AzureDataFactory.TestingFramework/Generated/Models/OracleServiceCloudObjectDataset.cs
@@ -34,7 +34,7 @@ public OracleServiceCloudObjectDataset(DataFactoryLinkedServiceReference linkedS
         /// <param name="folder"> The folder that this Dataset is in. If not specified, Dataset will appear at the root level. </param>
         /// <param name="additionalProperties"> Additional Properties. </param>
         /// <param name="tableName"> The table name. Type: string (or Expression with resultType string). </param>
-        internal OracleServiceCloudObjectDataset(string datasetType, string description, DataFactoryElement<IList<DatasetDataElement>> structure, DataFactoryElement<IList<DatasetSchemaDataElement>> schema, DataFactoryLinkedServiceReference linkedServiceName, IDictionary<string, EntityParameterSpecification> parameters, IList<BinaryData> annotations, DatasetFolder folder, IDictionary<string, BinaryData> additionalProperties, DataFactoryElement<string> tableName) : base(datasetType, description, structure, schema, linkedServiceName, parameters, annotations, folder, additionalProperties)
+        internal OracleServiceCloudObjectDataset(string datasetType, string description, DataFactoryElement<IList<DatasetDataElement>> structure, DataFactoryElement<IList<DatasetSchemaDataElement>> schema, DataFactoryLinkedServiceReference linkedServiceName, IDictionary<string, EntityParameterSpecification> parameters, IList<BinaryData> annotations, DatasetFolder folder, IDictionary<string, DataFactoryElement<string>> additionalProperties, DataFactoryElement<string> tableName) : base(datasetType, description, structure, schema, linkedServiceName, parameters, annotations, folder, additionalProperties)
         {
             TableName = tableName;
             DatasetType = datasetType ?? "OracleServiceCloudObject";
diff --git a/src/AzureDataFactory.TestingFramework/Generated/Models/OracleServiceCloudSource.Serialization.cs b/src/AzureDataFactory.TestingFramework/Generated/Models/OracleServiceCloudSource.Serialization.cs
index cb1174d3..4fc323c6 100644
--- a/src/AzureDataFactory.TestingFramework/Generated/Models/OracleServiceCloudSource.Serialization.cs
+++ b/src/AzureDataFactory.TestingFramework/Generated/Models/OracleServiceCloudSource.Serialization.cs
@@ -83,8 +83,8 @@ internal static OracleServiceCloudSource DeserializeOracleServiceCloudSource(Jso
             Optional<DataFactoryElement<string>> sourceRetryWait = default;
             Optional<DataFactoryElement<int>> maxConcurrentConnections = default;
             Optional<DataFactoryElement<bool>> disableMetricsCollection = default;
-            IDictionary<string, BinaryData> additionalProperties = default;
-            Dictionary<string, BinaryData> additionalPropertiesDictionary = new Dictionary<string, BinaryData>();
+            IDictionary<string, DataFactoryElement<string>> additionalProperties = default;
+            Dictionary<string, DataFactoryElement<string>> additionalPropertiesDictionary = new Dictionary<string, DataFactoryElement<string>>();
             foreach (var property in element.EnumerateObject())
             {
                 if (property.NameEquals("query"u8))
@@ -155,7 +155,7 @@ internal static OracleServiceCloudSource DeserializeOracleServiceCloudSource(Jso
                     disableMetricsCollection = JsonSerializer.Deserialize<DataFactoryElement<bool>>(property.Value.GetRawText());
                     continue;
                 }
-                additionalPropertiesDictionary.Add(property.Name, BinaryData.FromString(property.Value.GetRawText()));
+                additionalPropertiesDictionary.Add(property.Name, JsonSerializer.Deserialize<DataFactoryElement<string>>(property.Value.GetRawText()));
             }
             additionalProperties = additionalPropertiesDictionary;
             return new OracleServiceCloudSource(type, sourceRetryCount.Value, sourceRetryWait.Value, maxConcurrentConnections.Value, disableMetricsCollection.Value, additionalProperties, queryTimeout.Value, additionalColumns.Value, query.Value);
diff --git a/src/AzureDataFactory.TestingFramework/Generated/Models/OracleServiceCloudSource.cs b/src/AzureDataFactory.TestingFramework/Generated/Models/OracleServiceCloudSource.cs
index 6de8fb17..30832f73 100644
--- a/src/AzureDataFactory.TestingFramework/Generated/Models/OracleServiceCloudSource.cs
+++ b/src/AzureDataFactory.TestingFramework/Generated/Models/OracleServiceCloudSource.cs
@@ -28,7 +28,7 @@ public OracleServiceCloudSource()
         /// <param name="queryTimeout"> Query timeout. Type: string (or Expression with resultType string), pattern: ((\d+)\.)?(\d\d):(60|([0-5][0-9])):(60|([0-5][0-9])). </param>
         /// <param name="additionalColumns"> Specifies the additional columns to be added to source data. Type: array of objects(AdditionalColumns) (or Expression with resultType array of objects). </param>
         /// <param name="query"> A query to retrieve data from source. Type: string (or Expression with resultType string). </param>
-        internal OracleServiceCloudSource(string copySourceType, DataFactoryElement<int> sourceRetryCount, DataFactoryElement<string> sourceRetryWait, DataFactoryElement<int> maxConcurrentConnections, DataFactoryElement<bool> disableMetricsCollection, IDictionary<string, BinaryData> additionalProperties, DataFactoryElement<string> queryTimeout, BinaryData additionalColumns, DataFactoryElement<string> query) : base(copySourceType, sourceRetryCount, sourceRetryWait, maxConcurrentConnections, disableMetricsCollection, additionalProperties, queryTimeout, additionalColumns)
+        internal OracleServiceCloudSource(string copySourceType, DataFactoryElement<int> sourceRetryCount, DataFactoryElement<string> sourceRetryWait, DataFactoryElement<int> maxConcurrentConnections, DataFactoryElement<bool> disableMetricsCollection, IDictionary<string, DataFactoryElement<string>> additionalProperties, DataFactoryElement<string> queryTimeout, BinaryData additionalColumns, DataFactoryElement<string> query) : base(copySourceType, sourceRetryCount, sourceRetryWait, maxConcurrentConnections, disableMetricsCollection, additionalProperties, queryTimeout, additionalColumns)
         {
             Query = query;
             CopySourceType = copySourceType ?? "OracleServiceCloudSource";
diff --git a/src/AzureDataFactory.TestingFramework/Generated/Models/OracleSink.Serialization.cs b/src/AzureDataFactory.TestingFramework/Generated/Models/OracleSink.Serialization.cs
index 45da8a3e..c97fa0fb 100644
--- a/src/AzureDataFactory.TestingFramework/Generated/Models/OracleSink.Serialization.cs
+++ b/src/AzureDataFactory.TestingFramework/Generated/Models/OracleSink.Serialization.cs
@@ -79,8 +79,8 @@ internal static OracleSink DeserializeOracleSink(JsonElement element)
             Optional<DataFactoryElement<string>> sinkRetryWait = default;
             Optional<DataFactoryElement<int>> maxConcurrentConnections = default;
             Optional<DataFactoryElement<bool>> disableMetricsCollection = default;
-            IDictionary<string, BinaryData> additionalProperties = default;
-            Dictionary<string, BinaryData> additionalPropertiesDictionary = new Dictionary<string, BinaryData>();
+            IDictionary<string, DataFactoryElement<string>> additionalProperties = default;
+            Dictionary<string, DataFactoryElement<string>> additionalPropertiesDictionary = new Dictionary<string, DataFactoryElement<string>>();
             foreach (var property in element.EnumerateObject())
             {
                 if (property.NameEquals("preCopyScript"u8))
@@ -151,7 +151,7 @@ internal static OracleSink DeserializeOracleSink(JsonElement element)
                     disableMetricsCollection = JsonSerializer.Deserialize<DataFactoryElement<bool>>(property.Value.GetRawText());
                     continue;
                 }
-                additionalPropertiesDictionary.Add(property.Name, BinaryData.FromString(property.Value.GetRawText()));
+                additionalPropertiesDictionary.Add(property.Name, JsonSerializer.Deserialize<DataFactoryElement<string>>(property.Value.GetRawText()));
             }
             additionalProperties = additionalPropertiesDictionary;
             return new OracleSink(type, writeBatchSize.Value, writeBatchTimeout.Value, sinkRetryCount.Value, sinkRetryWait.Value, maxConcurrentConnections.Value, disableMetricsCollection.Value, additionalProperties, preCopyScript.Value);
diff --git a/src/AzureDataFactory.TestingFramework/Generated/Models/OracleSink.cs b/src/AzureDataFactory.TestingFramework/Generated/Models/OracleSink.cs
index 3d37c1e1..7f32ecda 100644
--- a/src/AzureDataFactory.TestingFramework/Generated/Models/OracleSink.cs
+++ b/src/AzureDataFactory.TestingFramework/Generated/Models/OracleSink.cs
@@ -28,7 +28,7 @@ public OracleSink()
         /// <param name="disableMetricsCollection"> If true, disable data store metrics collection. Default is false. Type: boolean (or Expression with resultType boolean). </param>
         /// <param name="additionalProperties"> Additional Properties. </param>
         /// <param name="preCopyScript"> SQL pre-copy script. Type: string (or Expression with resultType string). </param>
-        internal OracleSink(string copySinkType, DataFactoryElement<int> writeBatchSize, DataFactoryElement<string> writeBatchTimeout, DataFactoryElement<int> sinkRetryCount, DataFactoryElement<string> sinkRetryWait, DataFactoryElement<int> maxConcurrentConnections, DataFactoryElement<bool> disableMetricsCollection, IDictionary<string, BinaryData> additionalProperties, DataFactoryElement<string> preCopyScript) : base(copySinkType, writeBatchSize, writeBatchTimeout, sinkRetryCount, sinkRetryWait, maxConcurrentConnections, disableMetricsCollection, additionalProperties)
+        internal OracleSink(string copySinkType, DataFactoryElement<int> writeBatchSize, DataFactoryElement<string> writeBatchTimeout, DataFactoryElement<int> sinkRetryCount, DataFactoryElement<string> sinkRetryWait, DataFactoryElement<int> maxConcurrentConnections, DataFactoryElement<bool> disableMetricsCollection, IDictionary<string, DataFactoryElement<string>> additionalProperties, DataFactoryElement<string> preCopyScript) : base(copySinkType, writeBatchSize, writeBatchTimeout, sinkRetryCount, sinkRetryWait, maxConcurrentConnections, disableMetricsCollection, additionalProperties)
         {
             PreCopyScript = preCopyScript;
             CopySinkType = copySinkType ?? "OracleSink";
diff --git a/src/AzureDataFactory.TestingFramework/Generated/Models/OracleSource.Serialization.cs b/src/AzureDataFactory.TestingFramework/Generated/Models/OracleSource.Serialization.cs
index f3c9f51e..22525466 100644
--- a/src/AzureDataFactory.TestingFramework/Generated/Models/OracleSource.Serialization.cs
+++ b/src/AzureDataFactory.TestingFramework/Generated/Models/OracleSource.Serialization.cs
@@ -99,8 +99,8 @@ internal static OracleSource DeserializeOracleSource(JsonElement element)
             Optional<DataFactoryElement<string>> sourceRetryWait = default;
             Optional<DataFactoryElement<int>> maxConcurrentConnections = default;
             Optional<DataFactoryElement<bool>> disableMetricsCollection = default;
-            IDictionary<string, BinaryData> additionalProperties = default;
-            Dictionary<string, BinaryData> additionalPropertiesDictionary = new Dictionary<string, BinaryData>();
+            IDictionary<string, DataFactoryElement<string>> additionalProperties = default;
+            Dictionary<string, DataFactoryElement<string>> additionalPropertiesDictionary = new Dictionary<string, DataFactoryElement<string>>();
             foreach (var property in element.EnumerateObject())
             {
                 if (property.NameEquals("oracleReaderQuery"u8))
@@ -189,7 +189,7 @@ internal static OracleSource DeserializeOracleSource(JsonElement element)
                     disableMetricsCollection = JsonSerializer.Deserialize<DataFactoryElement<bool>>(property.Value.GetRawText());
                     continue;
                 }
-                additionalPropertiesDictionary.Add(property.Name, BinaryData.FromString(property.Value.GetRawText()));
+                additionalPropertiesDictionary.Add(property.Name, JsonSerializer.Deserialize<DataFactoryElement<string>>(property.Value.GetRawText()));
             }
             additionalProperties = additionalPropertiesDictionary;
             return new OracleSource(type, sourceRetryCount.Value, sourceRetryWait.Value, maxConcurrentConnections.Value, disableMetricsCollection.Value, additionalProperties, oracleReaderQuery.Value, queryTimeout.Value, partitionOption.Value, partitionSettings.Value, additionalColumns.Value);
diff --git a/src/AzureDataFactory.TestingFramework/Generated/Models/OracleSource.cs b/src/AzureDataFactory.TestingFramework/Generated/Models/OracleSource.cs
index e96ee546..4db525b9 100644
--- a/src/AzureDataFactory.TestingFramework/Generated/Models/OracleSource.cs
+++ b/src/AzureDataFactory.TestingFramework/Generated/Models/OracleSource.cs
@@ -30,7 +30,7 @@ public OracleSource()
         /// <param name="partitionOption"> The partition mechanism that will be used for Oracle read in parallel. Possible values include: "None", "PhysicalPartitionsOfTable", "DynamicRange". </param>
         /// <param name="partitionSettings"> The settings that will be leveraged for Oracle source partitioning. </param>
         /// <param name="additionalColumns"> Specifies the additional columns to be added to source data. Type: array of objects(AdditionalColumns) (or Expression with resultType array of objects). </param>
-        internal OracleSource(string copySourceType, DataFactoryElement<int> sourceRetryCount, DataFactoryElement<string> sourceRetryWait, DataFactoryElement<int> maxConcurrentConnections, DataFactoryElement<bool> disableMetricsCollection, IDictionary<string, BinaryData> additionalProperties, DataFactoryElement<string> oracleReaderQuery, DataFactoryElement<string> queryTimeout, BinaryData partitionOption, OraclePartitionSettings partitionSettings, BinaryData additionalColumns) : base(copySourceType, sourceRetryCount, sourceRetryWait, maxConcurrentConnections, disableMetricsCollection, additionalProperties)
+        internal OracleSource(string copySourceType, DataFactoryElement<int> sourceRetryCount, DataFactoryElement<string> sourceRetryWait, DataFactoryElement<int> maxConcurrentConnections, DataFactoryElement<bool> disableMetricsCollection, IDictionary<string, DataFactoryElement<string>> additionalProperties, DataFactoryElement<string> oracleReaderQuery, DataFactoryElement<string> queryTimeout, BinaryData partitionOption, OraclePartitionSettings partitionSettings, BinaryData additionalColumns) : base(copySourceType, sourceRetryCount, sourceRetryWait, maxConcurrentConnections, disableMetricsCollection, additionalProperties)
         {
             OracleReaderQuery = oracleReaderQuery;
             QueryTimeout = queryTimeout;
diff --git a/src/AzureDataFactory.TestingFramework/Generated/Models/OracleTableDataset.Serialization.cs b/src/AzureDataFactory.TestingFramework/Generated/Models/OracleTableDataset.Serialization.cs
index b9f3c4a0..ba3c7ca4 100644
--- a/src/AzureDataFactory.TestingFramework/Generated/Models/OracleTableDataset.Serialization.cs
+++ b/src/AzureDataFactory.TestingFramework/Generated/Models/OracleTableDataset.Serialization.cs
@@ -120,8 +120,8 @@ internal static OracleTableDataset DeserializeOracleTableDataset(JsonElement ele
             Optional<BinaryData> tableName = default;
             Optional<DataFactoryElement<string>> schema0 = default;
             Optional<DataFactoryElement<string>> table = default;
-            IDictionary<string, BinaryData> additionalProperties = default;
-            Dictionary<string, BinaryData> additionalPropertiesDictionary = new Dictionary<string, BinaryData>();
+            IDictionary<string, DataFactoryElement<string>> additionalProperties = default;
+            Dictionary<string, DataFactoryElement<string>> additionalPropertiesDictionary = new Dictionary<string, DataFactoryElement<string>>();
             foreach (var property in element.EnumerateObject())
             {
                 if (property.NameEquals("type"u8))
@@ -240,7 +240,7 @@ internal static OracleTableDataset DeserializeOracleTableDataset(JsonElement ele
                     }
                     continue;
                 }
-                additionalPropertiesDictionary.Add(property.Name, BinaryData.FromString(property.Value.GetRawText()));
+                additionalPropertiesDictionary.Add(property.Name, JsonSerializer.Deserialize<DataFactoryElement<string>>(property.Value.GetRawText()));
             }
             additionalProperties = additionalPropertiesDictionary;
             return new OracleTableDataset(type, description.Value, structure.Value, schema.Value, linkedServiceName, Optional.ToDictionary(parameters), Optional.ToList(annotations), folder.Value, additionalProperties, tableName.Value, schema0.Value, table.Value);
diff --git a/src/AzureDataFactory.TestingFramework/Generated/Models/OracleTableDataset.cs b/src/AzureDataFactory.TestingFramework/Generated/Models/OracleTableDataset.cs
index 1ae4cec1..ace68670 100644
--- a/src/AzureDataFactory.TestingFramework/Generated/Models/OracleTableDataset.cs
+++ b/src/AzureDataFactory.TestingFramework/Generated/Models/OracleTableDataset.cs
@@ -36,7 +36,7 @@ public OracleTableDataset(DataFactoryLinkedServiceReference linkedServiceName) :
         /// <param name="tableName"> This property will be retired. Please consider using schema + table properties instead. </param>
         /// <param name="schemaTypePropertiesSchema"> The schema name of the on-premises Oracle database. Type: string (or Expression with resultType string). </param>
         /// <param name="table"> The table name of the on-premises Oracle database. Type: string (or Expression with resultType string). </param>
-        internal OracleTableDataset(string datasetType, string description, DataFactoryElement<IList<DatasetDataElement>> structure, DataFactoryElement<IList<DatasetSchemaDataElement>> schema, DataFactoryLinkedServiceReference linkedServiceName, IDictionary<string, EntityParameterSpecification> parameters, IList<BinaryData> annotations, DatasetFolder folder, IDictionary<string, BinaryData> additionalProperties, BinaryData tableName, DataFactoryElement<string> schemaTypePropertiesSchema, DataFactoryElement<string> table) : base(datasetType, description, structure, schema, linkedServiceName, parameters, annotations, folder, additionalProperties)
+        internal OracleTableDataset(string datasetType, string description, DataFactoryElement<IList<DatasetDataElement>> structure, DataFactoryElement<IList<DatasetSchemaDataElement>> schema, DataFactoryLinkedServiceReference linkedServiceName, IDictionary<string, EntityParameterSpecification> parameters, IList<BinaryData> annotations, DatasetFolder folder, IDictionary<string, DataFactoryElement<string>> additionalProperties, BinaryData tableName, DataFactoryElement<string> schemaTypePropertiesSchema, DataFactoryElement<string> table) : base(datasetType, description, structure, schema, linkedServiceName, parameters, annotations, folder, additionalProperties)
         {
             TableName = tableName;
             SchemaTypePropertiesSchema = schemaTypePropertiesSchema;
diff --git a/src/AzureDataFactory.TestingFramework/Generated/Models/OrcDataset.Serialization.cs b/src/AzureDataFactory.TestingFramework/Generated/Models/OrcDataset.Serialization.cs
index d6ef8d1a..db27d2ae 100644
--- a/src/AzureDataFactory.TestingFramework/Generated/Models/OrcDataset.Serialization.cs
+++ b/src/AzureDataFactory.TestingFramework/Generated/Models/OrcDataset.Serialization.cs
@@ -110,8 +110,8 @@ internal static OrcDataset DeserializeOrcDataset(JsonElement element)
             Optional<DatasetFolder> folder = default;
             Optional<DatasetLocation> location = default;
             Optional<DataFactoryElement<string>> orcCompressionCodec = default;
-            IDictionary<string, BinaryData> additionalProperties = default;
-            Dictionary<string, BinaryData> additionalPropertiesDictionary = new Dictionary<string, BinaryData>();
+            IDictionary<string, DataFactoryElement<string>> additionalProperties = default;
+            Dictionary<string, DataFactoryElement<string>> additionalPropertiesDictionary = new Dictionary<string, DataFactoryElement<string>>();
             foreach (var property in element.EnumerateObject())
             {
                 if (property.NameEquals("type"u8))
@@ -221,7 +221,7 @@ internal static OrcDataset DeserializeOrcDataset(JsonElement element)
                     }
                     continue;
                 }
-                additionalPropertiesDictionary.Add(property.Name, BinaryData.FromString(property.Value.GetRawText()));
+                additionalPropertiesDictionary.Add(property.Name, JsonSerializer.Deserialize<DataFactoryElement<string>>(property.Value.GetRawText()));
             }
             additionalProperties = additionalPropertiesDictionary;
             return new OrcDataset(type, description.Value, structure.Value, schema.Value, linkedServiceName, Optional.ToDictionary(parameters), Optional.ToList(annotations), folder.Value, additionalProperties, location.Value, orcCompressionCodec.Value);
diff --git a/src/AzureDataFactory.TestingFramework/Generated/Models/OrcDataset.cs b/src/AzureDataFactory.TestingFramework/Generated/Models/OrcDataset.cs
index 2be7534a..fc579d10 100644
--- a/src/AzureDataFactory.TestingFramework/Generated/Models/OrcDataset.cs
+++ b/src/AzureDataFactory.TestingFramework/Generated/Models/OrcDataset.cs
@@ -39,7 +39,7 @@ public OrcDataset(DataFactoryLinkedServiceReference linkedServiceName) : base(li
         /// The available derived classes include <see cref="AmazonS3CompatibleLocation"/>, <see cref="AmazonS3Location"/>, <see cref="AzureBlobFSLocation"/>, <see cref="AzureBlobStorageLocation"/>, <see cref="AzureDataLakeStoreLocation"/>, <see cref="AzureFileStorageLocation"/>, <see cref="FileServerLocation"/>, <see cref="FtpServerLocation"/>, <see cref="GoogleCloudStorageLocation"/>, <see cref="HdfsLocation"/>, <see cref="HttpServerLocation"/>, <see cref="OracleCloudStorageLocation"/> and <see cref="SftpLocation"/>.
         /// </param>
         /// <param name="orcCompressionCodec"> The data orcCompressionCodec. Type: string (or Expression with resultType string). </param>
-        internal OrcDataset(string datasetType, string description, DataFactoryElement<IList<DatasetDataElement>> structure, DataFactoryElement<IList<DatasetSchemaDataElement>> schema, DataFactoryLinkedServiceReference linkedServiceName, IDictionary<string, EntityParameterSpecification> parameters, IList<BinaryData> annotations, DatasetFolder folder, IDictionary<string, BinaryData> additionalProperties, DatasetLocation dataLocation, DataFactoryElement<string> orcCompressionCodec) : base(datasetType, description, structure, schema, linkedServiceName, parameters, annotations, folder, additionalProperties)
+        internal OrcDataset(string datasetType, string description, DataFactoryElement<IList<DatasetDataElement>> structure, DataFactoryElement<IList<DatasetSchemaDataElement>> schema, DataFactoryLinkedServiceReference linkedServiceName, IDictionary<string, EntityParameterSpecification> parameters, IList<BinaryData> annotations, DatasetFolder folder, IDictionary<string, DataFactoryElement<string>> additionalProperties, DatasetLocation dataLocation, DataFactoryElement<string> orcCompressionCodec) : base(datasetType, description, structure, schema, linkedServiceName, parameters, annotations, folder, additionalProperties)
         {
             DataLocation = dataLocation;
             OrcCompressionCodec = orcCompressionCodec;
diff --git a/src/AzureDataFactory.TestingFramework/Generated/Models/OrcSink.Serialization.cs b/src/AzureDataFactory.TestingFramework/Generated/Models/OrcSink.Serialization.cs
index 8c1f2fd1..7d613659 100644
--- a/src/AzureDataFactory.TestingFramework/Generated/Models/OrcSink.Serialization.cs
+++ b/src/AzureDataFactory.TestingFramework/Generated/Models/OrcSink.Serialization.cs
@@ -85,8 +85,8 @@ internal static OrcSink DeserializeOrcSink(JsonElement element)
             Optional<DataFactoryElement<string>> sinkRetryWait = default;
             Optional<DataFactoryElement<int>> maxConcurrentConnections = default;
             Optional<DataFactoryElement<bool>> disableMetricsCollection = default;
-            IDictionary<string, BinaryData> additionalProperties = default;
-            Dictionary<string, BinaryData> additionalPropertiesDictionary = new Dictionary<string, BinaryData>();
+            IDictionary<string, DataFactoryElement<string>> additionalProperties = default;
+            Dictionary<string, DataFactoryElement<string>> additionalPropertiesDictionary = new Dictionary<string, DataFactoryElement<string>>();
             foreach (var property in element.EnumerateObject())
             {
                 if (property.NameEquals("storeSettings"u8))
@@ -166,7 +166,7 @@ internal static OrcSink DeserializeOrcSink(JsonElement element)
                     disableMetricsCollection = JsonSerializer.Deserialize<DataFactoryElement<bool>>(property.Value.GetRawText());
                     continue;
                 }
-                additionalPropertiesDictionary.Add(property.Name, BinaryData.FromString(property.Value.GetRawText()));
+                additionalPropertiesDictionary.Add(property.Name, JsonSerializer.Deserialize<DataFactoryElement<string>>(property.Value.GetRawText()));
             }
             additionalProperties = additionalPropertiesDictionary;
             return new OrcSink(type, writeBatchSize.Value, writeBatchTimeout.Value, sinkRetryCount.Value, sinkRetryWait.Value, maxConcurrentConnections.Value, disableMetricsCollection.Value, additionalProperties, storeSettings.Value, formatSettings.Value);
diff --git a/src/AzureDataFactory.TestingFramework/Generated/Models/OrcSink.cs b/src/AzureDataFactory.TestingFramework/Generated/Models/OrcSink.cs
index 520ffa39..3d118b17 100644
--- a/src/AzureDataFactory.TestingFramework/Generated/Models/OrcSink.cs
+++ b/src/AzureDataFactory.TestingFramework/Generated/Models/OrcSink.cs
@@ -33,7 +33,7 @@ public OrcSink()
         /// The available derived classes include <see cref="AzureBlobFSWriteSettings"/>, <see cref="AzureBlobStorageWriteSettings"/>, <see cref="AzureDataLakeStoreWriteSettings"/>, <see cref="AzureFileStorageWriteSettings"/>, <see cref="FileServerWriteSettings"/> and <see cref="SftpWriteSettings"/>.
         /// </param>
         /// <param name="formatSettings"> ORC format settings. </param>
-        internal OrcSink(string copySinkType, DataFactoryElement<int> writeBatchSize, DataFactoryElement<string> writeBatchTimeout, DataFactoryElement<int> sinkRetryCount, DataFactoryElement<string> sinkRetryWait, DataFactoryElement<int> maxConcurrentConnections, DataFactoryElement<bool> disableMetricsCollection, IDictionary<string, BinaryData> additionalProperties, StoreWriteSettings storeSettings, OrcWriteSettings formatSettings) : base(copySinkType, writeBatchSize, writeBatchTimeout, sinkRetryCount, sinkRetryWait, maxConcurrentConnections, disableMetricsCollection, additionalProperties)
+        internal OrcSink(string copySinkType, DataFactoryElement<int> writeBatchSize, DataFactoryElement<string> writeBatchTimeout, DataFactoryElement<int> sinkRetryCount, DataFactoryElement<string> sinkRetryWait, DataFactoryElement<int> maxConcurrentConnections, DataFactoryElement<bool> disableMetricsCollection, IDictionary<string, DataFactoryElement<string>> additionalProperties, StoreWriteSettings storeSettings, OrcWriteSettings formatSettings) : base(copySinkType, writeBatchSize, writeBatchTimeout, sinkRetryCount, sinkRetryWait, maxConcurrentConnections, disableMetricsCollection, additionalProperties)
         {
             StoreSettings = storeSettings;
             FormatSettings = formatSettings;
diff --git a/src/AzureDataFactory.TestingFramework/Generated/Models/OrcSource.Serialization.cs b/src/AzureDataFactory.TestingFramework/Generated/Models/OrcSource.Serialization.cs
index 48895bfb..2d7d1763 100644
--- a/src/AzureDataFactory.TestingFramework/Generated/Models/OrcSource.Serialization.cs
+++ b/src/AzureDataFactory.TestingFramework/Generated/Models/OrcSource.Serialization.cs
@@ -77,8 +77,8 @@ internal static OrcSource DeserializeOrcSource(JsonElement element)
             Optional<DataFactoryElement<string>> sourceRetryWait = default;
             Optional<DataFactoryElement<int>> maxConcurrentConnections = default;
             Optional<DataFactoryElement<bool>> disableMetricsCollection = default;
-            IDictionary<string, BinaryData> additionalProperties = default;
-            Dictionary<string, BinaryData> additionalPropertiesDictionary = new Dictionary<string, BinaryData>();
+            IDictionary<string, DataFactoryElement<string>> additionalProperties = default;
+            Dictionary<string, DataFactoryElement<string>> additionalPropertiesDictionary = new Dictionary<string, DataFactoryElement<string>>();
             foreach (var property in element.EnumerateObject())
             {
                 if (property.NameEquals("storeSettings"u8))
@@ -140,7 +140,7 @@ internal static OrcSource DeserializeOrcSource(JsonElement element)
                     disableMetricsCollection = JsonSerializer.Deserialize<DataFactoryElement<bool>>(property.Value.GetRawText());
                     continue;
                 }
-                additionalPropertiesDictionary.Add(property.Name, BinaryData.FromString(property.Value.GetRawText()));
+                additionalPropertiesDictionary.Add(property.Name, JsonSerializer.Deserialize<DataFactoryElement<string>>(property.Value.GetRawText()));
             }
             additionalProperties = additionalPropertiesDictionary;
             return new OrcSource(type, sourceRetryCount.Value, sourceRetryWait.Value, maxConcurrentConnections.Value, disableMetricsCollection.Value, additionalProperties, storeSettings.Value, additionalColumns.Value);
diff --git a/src/AzureDataFactory.TestingFramework/Generated/Models/OrcSource.cs b/src/AzureDataFactory.TestingFramework/Generated/Models/OrcSource.cs
index 4dbacd56..dacdf6f3 100644
--- a/src/AzureDataFactory.TestingFramework/Generated/Models/OrcSource.cs
+++ b/src/AzureDataFactory.TestingFramework/Generated/Models/OrcSource.cs
@@ -31,7 +31,7 @@ public OrcSource()
         /// The available derived classes include <see cref="AmazonS3CompatibleReadSettings"/>, <see cref="AmazonS3ReadSettings"/>, <see cref="AzureBlobFSReadSettings"/>, <see cref="AzureBlobStorageReadSettings"/>, <see cref="AzureDataLakeStoreReadSettings"/>, <see cref="AzureFileStorageReadSettings"/>, <see cref="FileServerReadSettings"/>, <see cref="FtpReadSettings"/>, <see cref="GoogleCloudStorageReadSettings"/>, <see cref="HdfsReadSettings"/>, <see cref="HttpReadSettings"/>, <see cref="OracleCloudStorageReadSettings"/> and <see cref="SftpReadSettings"/>.
         /// </param>
         /// <param name="additionalColumns"> Specifies the additional columns to be added to source data. Type: array of objects(AdditionalColumns) (or Expression with resultType array of objects). </param>
-        internal OrcSource(string copySourceType, DataFactoryElement<int> sourceRetryCount, DataFactoryElement<string> sourceRetryWait, DataFactoryElement<int> maxConcurrentConnections, DataFactoryElement<bool> disableMetricsCollection, IDictionary<string, BinaryData> additionalProperties, StoreReadSettings storeSettings, BinaryData additionalColumns) : base(copySourceType, sourceRetryCount, sourceRetryWait, maxConcurrentConnections, disableMetricsCollection, additionalProperties)
+        internal OrcSource(string copySourceType, DataFactoryElement<int> sourceRetryCount, DataFactoryElement<string> sourceRetryWait, DataFactoryElement<int> maxConcurrentConnections, DataFactoryElement<bool> disableMetricsCollection, IDictionary<string, DataFactoryElement<string>> additionalProperties, StoreReadSettings storeSettings, BinaryData additionalColumns) : base(copySourceType, sourceRetryCount, sourceRetryWait, maxConcurrentConnections, disableMetricsCollection, additionalProperties)
         {
             StoreSettings = storeSettings;
             AdditionalColumns = additionalColumns;
diff --git a/src/AzureDataFactory.TestingFramework/Generated/Models/OrcWriteSettings.Serialization.cs b/src/AzureDataFactory.TestingFramework/Generated/Models/OrcWriteSettings.Serialization.cs
index 58e48e45..659a7e2b 100644
--- a/src/AzureDataFactory.TestingFramework/Generated/Models/OrcWriteSettings.Serialization.cs
+++ b/src/AzureDataFactory.TestingFramework/Generated/Models/OrcWriteSettings.Serialization.cs
@@ -49,8 +49,8 @@ internal static OrcWriteSettings DeserializeOrcWriteSettings(JsonElement element
             Optional<DataFactoryElement<int>> maxRowsPerFile = default;
             Optional<DataFactoryElement<string>> fileNamePrefix = default;
             string type = default;
-            IDictionary<string, BinaryData> additionalProperties = default;
-            Dictionary<string, BinaryData> additionalPropertiesDictionary = new Dictionary<string, BinaryData>();
+            IDictionary<string, DataFactoryElement<string>> additionalProperties = default;
+            Dictionary<string, DataFactoryElement<string>> additionalPropertiesDictionary = new Dictionary<string, DataFactoryElement<string>>();
             foreach (var property in element.EnumerateObject())
             {
                 if (property.NameEquals("maxRowsPerFile"u8))
@@ -76,7 +76,7 @@ internal static OrcWriteSettings DeserializeOrcWriteSettings(JsonElement element
                     type = property.Value.GetString();
                     continue;
                 }
-                additionalPropertiesDictionary.Add(property.Name, BinaryData.FromString(property.Value.GetRawText()));
+                additionalPropertiesDictionary.Add(property.Name, JsonSerializer.Deserialize<DataFactoryElement<string>>(property.Value.GetRawText()));
             }
             additionalProperties = additionalPropertiesDictionary;
             return new OrcWriteSettings(type, additionalProperties, maxRowsPerFile.Value, fileNamePrefix.Value);
diff --git a/src/AzureDataFactory.TestingFramework/Generated/Models/OrcWriteSettings.cs b/src/AzureDataFactory.TestingFramework/Generated/Models/OrcWriteSettings.cs
index c416a97a..f52ebeb0 100644
--- a/src/AzureDataFactory.TestingFramework/Generated/Models/OrcWriteSettings.cs
+++ b/src/AzureDataFactory.TestingFramework/Generated/Models/OrcWriteSettings.cs
@@ -23,7 +23,7 @@ public OrcWriteSettings()
         /// <param name="additionalProperties"> Additional Properties. </param>
         /// <param name="maxRowsPerFile"> Limit the written file's row count to be smaller than or equal to the specified count. Type: integer (or Expression with resultType integer). </param>
         /// <param name="fileNamePrefix"> Specifies the file name pattern &lt;fileNamePrefix&gt;_&lt;fileIndex&gt;.&lt;fileExtension&gt; when copy from non-file based store without partitionOptions. Type: string (or Expression with resultType string). </param>
-        internal OrcWriteSettings(string formatWriteSettingsType, IDictionary<string, BinaryData> additionalProperties, DataFactoryElement<int> maxRowsPerFile, DataFactoryElement<string> fileNamePrefix) : base(formatWriteSettingsType, additionalProperties)
+        internal OrcWriteSettings(string formatWriteSettingsType, IDictionary<string, DataFactoryElement<string>> additionalProperties, DataFactoryElement<int> maxRowsPerFile, DataFactoryElement<string> fileNamePrefix) : base(formatWriteSettingsType, additionalProperties)
         {
             MaxRowsPerFile = maxRowsPerFile;
             FileNamePrefix = fileNamePrefix;
diff --git a/src/AzureDataFactory.TestingFramework/Generated/Models/ParquetDataset.Serialization.cs b/src/AzureDataFactory.TestingFramework/Generated/Models/ParquetDataset.Serialization.cs
index 4885e59f..b9346b9e 100644
--- a/src/AzureDataFactory.TestingFramework/Generated/Models/ParquetDataset.Serialization.cs
+++ b/src/AzureDataFactory.TestingFramework/Generated/Models/ParquetDataset.Serialization.cs
@@ -110,8 +110,8 @@ internal static ParquetDataset DeserializeParquetDataset(JsonElement element)
             Optional<DatasetFolder> folder = default;
             Optional<DatasetLocation> location = default;
             Optional<DataFactoryElement<string>> compressionCodec = default;
-            IDictionary<string, BinaryData> additionalProperties = default;
-            Dictionary<string, BinaryData> additionalPropertiesDictionary = new Dictionary<string, BinaryData>();
+            IDictionary<string, DataFactoryElement<string>> additionalProperties = default;
+            Dictionary<string, DataFactoryElement<string>> additionalPropertiesDictionary = new Dictionary<string, DataFactoryElement<string>>();
             foreach (var property in element.EnumerateObject())
             {
                 if (property.NameEquals("type"u8))
@@ -221,7 +221,7 @@ internal static ParquetDataset DeserializeParquetDataset(JsonElement element)
                     }
                     continue;
                 }
-                additionalPropertiesDictionary.Add(property.Name, BinaryData.FromString(property.Value.GetRawText()));
+                additionalPropertiesDictionary.Add(property.Name, JsonSerializer.Deserialize<DataFactoryElement<string>>(property.Value.GetRawText()));
             }
             additionalProperties = additionalPropertiesDictionary;
             return new ParquetDataset(type, description.Value, structure.Value, schema.Value, linkedServiceName, Optional.ToDictionary(parameters), Optional.ToList(annotations), folder.Value, additionalProperties, location.Value, compressionCodec.Value);
diff --git a/src/AzureDataFactory.TestingFramework/Generated/Models/ParquetDataset.cs b/src/AzureDataFactory.TestingFramework/Generated/Models/ParquetDataset.cs
index 0bb26ed0..a0373f1a 100644
--- a/src/AzureDataFactory.TestingFramework/Generated/Models/ParquetDataset.cs
+++ b/src/AzureDataFactory.TestingFramework/Generated/Models/ParquetDataset.cs
@@ -39,7 +39,7 @@ public ParquetDataset(DataFactoryLinkedServiceReference linkedServiceName) : bas
         /// The available derived classes include <see cref="AmazonS3CompatibleLocation"/>, <see cref="AmazonS3Location"/>, <see cref="AzureBlobFSLocation"/>, <see cref="AzureBlobStorageLocation"/>, <see cref="AzureDataLakeStoreLocation"/>, <see cref="AzureFileStorageLocation"/>, <see cref="FileServerLocation"/>, <see cref="FtpServerLocation"/>, <see cref="GoogleCloudStorageLocation"/>, <see cref="HdfsLocation"/>, <see cref="HttpServerLocation"/>, <see cref="OracleCloudStorageLocation"/> and <see cref="SftpLocation"/>.
         /// </param>
         /// <param name="compressionCodec"> The data compressionCodec. Type: string (or Expression with resultType string). </param>
-        internal ParquetDataset(string datasetType, string description, DataFactoryElement<IList<DatasetDataElement>> structure, DataFactoryElement<IList<DatasetSchemaDataElement>> schema, DataFactoryLinkedServiceReference linkedServiceName, IDictionary<string, EntityParameterSpecification> parameters, IList<BinaryData> annotations, DatasetFolder folder, IDictionary<string, BinaryData> additionalProperties, DatasetLocation dataLocation, DataFactoryElement<string> compressionCodec) : base(datasetType, description, structure, schema, linkedServiceName, parameters, annotations, folder, additionalProperties)
+        internal ParquetDataset(string datasetType, string description, DataFactoryElement<IList<DatasetDataElement>> structure, DataFactoryElement<IList<DatasetSchemaDataElement>> schema, DataFactoryLinkedServiceReference linkedServiceName, IDictionary<string, EntityParameterSpecification> parameters, IList<BinaryData> annotations, DatasetFolder folder, IDictionary<string, DataFactoryElement<string>> additionalProperties, DatasetLocation dataLocation, DataFactoryElement<string> compressionCodec) : base(datasetType, description, structure, schema, linkedServiceName, parameters, annotations, folder, additionalProperties)
         {
             DataLocation = dataLocation;
             CompressionCodec = compressionCodec;
diff --git a/src/AzureDataFactory.TestingFramework/Generated/Models/ParquetSink.Serialization.cs b/src/AzureDataFactory.TestingFramework/Generated/Models/ParquetSink.Serialization.cs
index 7ff45e41..3fb24ceb 100644
--- a/src/AzureDataFactory.TestingFramework/Generated/Models/ParquetSink.Serialization.cs
+++ b/src/AzureDataFactory.TestingFramework/Generated/Models/ParquetSink.Serialization.cs
@@ -85,8 +85,8 @@ internal static ParquetSink DeserializeParquetSink(JsonElement element)
             Optional<DataFactoryElement<string>> sinkRetryWait = default;
             Optional<DataFactoryElement<int>> maxConcurrentConnections = default;
             Optional<DataFactoryElement<bool>> disableMetricsCollection = default;
-            IDictionary<string, BinaryData> additionalProperties = default;
-            Dictionary<string, BinaryData> additionalPropertiesDictionary = new Dictionary<string, BinaryData>();
+            IDictionary<string, DataFactoryElement<string>> additionalProperties = default;
+            Dictionary<string, DataFactoryElement<string>> additionalPropertiesDictionary = new Dictionary<string, DataFactoryElement<string>>();
             foreach (var property in element.EnumerateObject())
             {
                 if (property.NameEquals("storeSettings"u8))
@@ -166,7 +166,7 @@ internal static ParquetSink DeserializeParquetSink(JsonElement element)
                     disableMetricsCollection = JsonSerializer.Deserialize<DataFactoryElement<bool>>(property.Value.GetRawText());
                     continue;
                 }
-                additionalPropertiesDictionary.Add(property.Name, BinaryData.FromString(property.Value.GetRawText()));
+                additionalPropertiesDictionary.Add(property.Name, JsonSerializer.Deserialize<DataFactoryElement<string>>(property.Value.GetRawText()));
             }
             additionalProperties = additionalPropertiesDictionary;
             return new ParquetSink(type, writeBatchSize.Value, writeBatchTimeout.Value, sinkRetryCount.Value, sinkRetryWait.Value, maxConcurrentConnections.Value, disableMetricsCollection.Value, additionalProperties, storeSettings.Value, formatSettings.Value);
diff --git a/src/AzureDataFactory.TestingFramework/Generated/Models/ParquetSink.cs b/src/AzureDataFactory.TestingFramework/Generated/Models/ParquetSink.cs
index 7f6644ef..2ad61592 100644
--- a/src/AzureDataFactory.TestingFramework/Generated/Models/ParquetSink.cs
+++ b/src/AzureDataFactory.TestingFramework/Generated/Models/ParquetSink.cs
@@ -33,7 +33,7 @@ public ParquetSink()
         /// The available derived classes include <see cref="AzureBlobFSWriteSettings"/>, <see cref="AzureBlobStorageWriteSettings"/>, <see cref="AzureDataLakeStoreWriteSettings"/>, <see cref="AzureFileStorageWriteSettings"/>, <see cref="FileServerWriteSettings"/> and <see cref="SftpWriteSettings"/>.
         /// </param>
         /// <param name="formatSettings"> Parquet format settings. </param>
-        internal ParquetSink(string copySinkType, DataFactoryElement<int> writeBatchSize, DataFactoryElement<string> writeBatchTimeout, DataFactoryElement<int> sinkRetryCount, DataFactoryElement<string> sinkRetryWait, DataFactoryElement<int> maxConcurrentConnections, DataFactoryElement<bool> disableMetricsCollection, IDictionary<string, BinaryData> additionalProperties, StoreWriteSettings storeSettings, ParquetWriteSettings formatSettings) : base(copySinkType, writeBatchSize, writeBatchTimeout, sinkRetryCount, sinkRetryWait, maxConcurrentConnections, disableMetricsCollection, additionalProperties)
+        internal ParquetSink(string copySinkType, DataFactoryElement<int> writeBatchSize, DataFactoryElement<string> writeBatchTimeout, DataFactoryElement<int> sinkRetryCount, DataFactoryElement<string> sinkRetryWait, DataFactoryElement<int> maxConcurrentConnections, DataFactoryElement<bool> disableMetricsCollection, IDictionary<string, DataFactoryElement<string>> additionalProperties, StoreWriteSettings storeSettings, ParquetWriteSettings formatSettings) : base(copySinkType, writeBatchSize, writeBatchTimeout, sinkRetryCount, sinkRetryWait, maxConcurrentConnections, disableMetricsCollection, additionalProperties)
         {
             StoreSettings = storeSettings;
             FormatSettings = formatSettings;
diff --git a/src/AzureDataFactory.TestingFramework/Generated/Models/ParquetSource.Serialization.cs b/src/AzureDataFactory.TestingFramework/Generated/Models/ParquetSource.Serialization.cs
index b30378b6..8ed00227 100644
--- a/src/AzureDataFactory.TestingFramework/Generated/Models/ParquetSource.Serialization.cs
+++ b/src/AzureDataFactory.TestingFramework/Generated/Models/ParquetSource.Serialization.cs
@@ -77,8 +77,8 @@ internal static ParquetSource DeserializeParquetSource(JsonElement element)
             Optional<DataFactoryElement<string>> sourceRetryWait = default;
             Optional<DataFactoryElement<int>> maxConcurrentConnections = default;
             Optional<DataFactoryElement<bool>> disableMetricsCollection = default;
-            IDictionary<string, BinaryData> additionalProperties = default;
-            Dictionary<string, BinaryData> additionalPropertiesDictionary = new Dictionary<string, BinaryData>();
+            IDictionary<string, DataFactoryElement<string>> additionalProperties = default;
+            Dictionary<string, DataFactoryElement<string>> additionalPropertiesDictionary = new Dictionary<string, DataFactoryElement<string>>();
             foreach (var property in element.EnumerateObject())
             {
                 if (property.NameEquals("storeSettings"u8))
@@ -140,7 +140,7 @@ internal static ParquetSource DeserializeParquetSource(JsonElement element)
                     disableMetricsCollection = JsonSerializer.Deserialize<DataFactoryElement<bool>>(property.Value.GetRawText());
                     continue;
                 }
-                additionalPropertiesDictionary.Add(property.Name, BinaryData.FromString(property.Value.GetRawText()));
+                additionalPropertiesDictionary.Add(property.Name, JsonSerializer.Deserialize<DataFactoryElement<string>>(property.Value.GetRawText()));
             }
             additionalProperties = additionalPropertiesDictionary;
             return new ParquetSource(type, sourceRetryCount.Value, sourceRetryWait.Value, maxConcurrentConnections.Value, disableMetricsCollection.Value, additionalProperties, storeSettings.Value, additionalColumns.Value);
diff --git a/src/AzureDataFactory.TestingFramework/Generated/Models/ParquetSource.cs b/src/AzureDataFactory.TestingFramework/Generated/Models/ParquetSource.cs
index 6a92bae5..84c85f8b 100644
--- a/src/AzureDataFactory.TestingFramework/Generated/Models/ParquetSource.cs
+++ b/src/AzureDataFactory.TestingFramework/Generated/Models/ParquetSource.cs
@@ -31,7 +31,7 @@ public ParquetSource()
         /// The available derived classes include <see cref="AmazonS3CompatibleReadSettings"/>, <see cref="AmazonS3ReadSettings"/>, <see cref="AzureBlobFSReadSettings"/>, <see cref="AzureBlobStorageReadSettings"/>, <see cref="AzureDataLakeStoreReadSettings"/>, <see cref="AzureFileStorageReadSettings"/>, <see cref="FileServerReadSettings"/>, <see cref="FtpReadSettings"/>, <see cref="GoogleCloudStorageReadSettings"/>, <see cref="HdfsReadSettings"/>, <see cref="HttpReadSettings"/>, <see cref="OracleCloudStorageReadSettings"/> and <see cref="SftpReadSettings"/>.
         /// </param>
         /// <param name="additionalColumns"> Specifies the additional columns to be added to source data. Type: array of objects(AdditionalColumns) (or Expression with resultType array of objects). </param>
-        internal ParquetSource(string copySourceType, DataFactoryElement<int> sourceRetryCount, DataFactoryElement<string> sourceRetryWait, DataFactoryElement<int> maxConcurrentConnections, DataFactoryElement<bool> disableMetricsCollection, IDictionary<string, BinaryData> additionalProperties, StoreReadSettings storeSettings, BinaryData additionalColumns) : base(copySourceType, sourceRetryCount, sourceRetryWait, maxConcurrentConnections, disableMetricsCollection, additionalProperties)
+        internal ParquetSource(string copySourceType, DataFactoryElement<int> sourceRetryCount, DataFactoryElement<string> sourceRetryWait, DataFactoryElement<int> maxConcurrentConnections, DataFactoryElement<bool> disableMetricsCollection, IDictionary<string, DataFactoryElement<string>> additionalProperties, StoreReadSettings storeSettings, BinaryData additionalColumns) : base(copySourceType, sourceRetryCount, sourceRetryWait, maxConcurrentConnections, disableMetricsCollection, additionalProperties)
         {
             StoreSettings = storeSettings;
             AdditionalColumns = additionalColumns;
diff --git a/src/AzureDataFactory.TestingFramework/Generated/Models/ParquetWriteSettings.Serialization.cs b/src/AzureDataFactory.TestingFramework/Generated/Models/ParquetWriteSettings.Serialization.cs
index ec347eac..0a2119b4 100644
--- a/src/AzureDataFactory.TestingFramework/Generated/Models/ParquetWriteSettings.Serialization.cs
+++ b/src/AzureDataFactory.TestingFramework/Generated/Models/ParquetWriteSettings.Serialization.cs
@@ -49,8 +49,8 @@ internal static ParquetWriteSettings DeserializeParquetWriteSettings(JsonElement
             Optional<DataFactoryElement<int>> maxRowsPerFile = default;
             Optional<DataFactoryElement<string>> fileNamePrefix = default;
             string type = default;
-            IDictionary<string, BinaryData> additionalProperties = default;
-            Dictionary<string, BinaryData> additionalPropertiesDictionary = new Dictionary<string, BinaryData>();
+            IDictionary<string, DataFactoryElement<string>> additionalProperties = default;
+            Dictionary<string, DataFactoryElement<string>> additionalPropertiesDictionary = new Dictionary<string, DataFactoryElement<string>>();
             foreach (var property in element.EnumerateObject())
             {
                 if (property.NameEquals("maxRowsPerFile"u8))
@@ -76,7 +76,7 @@ internal static ParquetWriteSettings DeserializeParquetWriteSettings(JsonElement
                     type = property.Value.GetString();
                     continue;
                 }
-                additionalPropertiesDictionary.Add(property.Name, BinaryData.FromString(property.Value.GetRawText()));
+                additionalPropertiesDictionary.Add(property.Name, JsonSerializer.Deserialize<DataFactoryElement<string>>(property.Value.GetRawText()));
             }
             additionalProperties = additionalPropertiesDictionary;
             return new ParquetWriteSettings(type, additionalProperties, maxRowsPerFile.Value, fileNamePrefix.Value);
diff --git a/src/AzureDataFactory.TestingFramework/Generated/Models/ParquetWriteSettings.cs b/src/AzureDataFactory.TestingFramework/Generated/Models/ParquetWriteSettings.cs
index a4717450..f9d76aef 100644
--- a/src/AzureDataFactory.TestingFramework/Generated/Models/ParquetWriteSettings.cs
+++ b/src/AzureDataFactory.TestingFramework/Generated/Models/ParquetWriteSettings.cs
@@ -23,7 +23,7 @@ public ParquetWriteSettings()
         /// <param name="additionalProperties"> Additional Properties. </param>
         /// <param name="maxRowsPerFile"> Limit the written file's row count to be smaller than or equal to the specified count. Type: integer (or Expression with resultType integer). </param>
         /// <param name="fileNamePrefix"> Specifies the file name pattern &lt;fileNamePrefix&gt;_&lt;fileIndex&gt;.&lt;fileExtension&gt; when copy from non-file based store without partitionOptions. Type: string (or Expression with resultType string). </param>
-        internal ParquetWriteSettings(string formatWriteSettingsType, IDictionary<string, BinaryData> additionalProperties, DataFactoryElement<int> maxRowsPerFile, DataFactoryElement<string> fileNamePrefix) : base(formatWriteSettingsType, additionalProperties)
+        internal ParquetWriteSettings(string formatWriteSettingsType, IDictionary<string, DataFactoryElement<string>> additionalProperties, DataFactoryElement<int> maxRowsPerFile, DataFactoryElement<string> fileNamePrefix) : base(formatWriteSettingsType, additionalProperties)
         {
             MaxRowsPerFile = maxRowsPerFile;
             FileNamePrefix = fileNamePrefix;
diff --git a/src/AzureDataFactory.TestingFramework/Generated/Models/PaypalLinkedService.Serialization.cs b/src/AzureDataFactory.TestingFramework/Generated/Models/PaypalLinkedService.Serialization.cs
index fb3e5b11..b4c4f884 100644
--- a/src/AzureDataFactory.TestingFramework/Generated/Models/PaypalLinkedService.Serialization.cs
+++ b/src/AzureDataFactory.TestingFramework/Generated/Models/PaypalLinkedService.Serialization.cs
@@ -120,8 +120,8 @@ internal static PaypalLinkedService DeserializePaypalLinkedService(JsonElement e
             Optional<DataFactoryElement<bool>> useHostVerification = default;
             Optional<DataFactoryElement<bool>> usePeerVerification = default;
             Optional<string> encryptedCredential = default;
-            IDictionary<string, BinaryData> additionalProperties = default;
-            Dictionary<string, BinaryData> additionalPropertiesDictionary = new Dictionary<string, BinaryData>();
+            IDictionary<string, DataFactoryElement<string>> additionalProperties = default;
+            Dictionary<string, DataFactoryElement<string>> additionalPropertiesDictionary = new Dictionary<string, DataFactoryElement<string>>();
             foreach (var property in element.EnumerateObject())
             {
                 if (property.NameEquals("type"u8))
@@ -241,7 +241,7 @@ internal static PaypalLinkedService DeserializePaypalLinkedService(JsonElement e
                     }
                     continue;
                 }
-                additionalPropertiesDictionary.Add(property.Name, BinaryData.FromString(property.Value.GetRawText()));
+                additionalPropertiesDictionary.Add(property.Name, JsonSerializer.Deserialize<DataFactoryElement<string>>(property.Value.GetRawText()));
             }
             additionalProperties = additionalPropertiesDictionary;
             return new PaypalLinkedService(type, connectVia.Value, description.Value, Optional.ToDictionary(parameters), Optional.ToList(annotations), additionalProperties, host, clientId, clientSecret, useEncryptedEndpoints.Value, useHostVerification.Value, usePeerVerification.Value, encryptedCredential.Value);
diff --git a/src/AzureDataFactory.TestingFramework/Generated/Models/PaypalLinkedService.cs b/src/AzureDataFactory.TestingFramework/Generated/Models/PaypalLinkedService.cs
index 82ac2255..b0c30b91 100644
--- a/src/AzureDataFactory.TestingFramework/Generated/Models/PaypalLinkedService.cs
+++ b/src/AzureDataFactory.TestingFramework/Generated/Models/PaypalLinkedService.cs
@@ -41,7 +41,7 @@ public PaypalLinkedService(DataFactoryElement<string> host, DataFactoryElement<s
         /// <param name="useHostVerification"> Specifies whether to require the host name in the server's certificate to match the host name of the server when connecting over SSL. The default value is true. </param>
         /// <param name="usePeerVerification"> Specifies whether to verify the identity of the server when connecting over SSL. The default value is true. </param>
         /// <param name="encryptedCredential"> The encrypted credential used for authentication. Credentials are encrypted using the integration runtime credential manager. Type: string. </param>
-        internal PaypalLinkedService(string linkedServiceType, IntegrationRuntimeReference connectVia, string description, IDictionary<string, EntityParameterSpecification> parameters, IList<BinaryData> annotations, IDictionary<string, BinaryData> additionalProperties, DataFactoryElement<string> host, DataFactoryElement<string> clientId, DataFactorySecretBaseDefinition clientSecret, DataFactoryElement<bool> useEncryptedEndpoints, DataFactoryElement<bool> useHostVerification, DataFactoryElement<bool> usePeerVerification, string encryptedCredential) : base(linkedServiceType, connectVia, description, parameters, annotations, additionalProperties)
+        internal PaypalLinkedService(string linkedServiceType, IntegrationRuntimeReference connectVia, string description, IDictionary<string, EntityParameterSpecification> parameters, IList<BinaryData> annotations, IDictionary<string, DataFactoryElement<string>> additionalProperties, DataFactoryElement<string> host, DataFactoryElement<string> clientId, DataFactorySecretBaseDefinition clientSecret, DataFactoryElement<bool> useEncryptedEndpoints, DataFactoryElement<bool> useHostVerification, DataFactoryElement<bool> usePeerVerification, string encryptedCredential) : base(linkedServiceType, connectVia, description, parameters, annotations, additionalProperties)
         {
             Host = host;
             ClientId = clientId;
diff --git a/src/AzureDataFactory.TestingFramework/Generated/Models/PaypalObjectDataset.Serialization.cs b/src/AzureDataFactory.TestingFramework/Generated/Models/PaypalObjectDataset.Serialization.cs
index 882b2f7f..071370d0 100644
--- a/src/AzureDataFactory.TestingFramework/Generated/Models/PaypalObjectDataset.Serialization.cs
+++ b/src/AzureDataFactory.TestingFramework/Generated/Models/PaypalObjectDataset.Serialization.cs
@@ -104,8 +104,8 @@ internal static PaypalObjectDataset DeserializePaypalObjectDataset(JsonElement e
             Optional<IList<BinaryData>> annotations = default;
             Optional<DatasetFolder> folder = default;
             Optional<DataFactoryElement<string>> tableName = default;
-            IDictionary<string, BinaryData> additionalProperties = default;
-            Dictionary<string, BinaryData> additionalPropertiesDictionary = new Dictionary<string, BinaryData>();
+            IDictionary<string, DataFactoryElement<string>> additionalProperties = default;
+            Dictionary<string, DataFactoryElement<string>> additionalPropertiesDictionary = new Dictionary<string, DataFactoryElement<string>>();
             foreach (var property in element.EnumerateObject())
             {
                 if (property.NameEquals("type"u8))
@@ -206,7 +206,7 @@ internal static PaypalObjectDataset DeserializePaypalObjectDataset(JsonElement e
                     }
                     continue;
                 }
-                additionalPropertiesDictionary.Add(property.Name, BinaryData.FromString(property.Value.GetRawText()));
+                additionalPropertiesDictionary.Add(property.Name, JsonSerializer.Deserialize<DataFactoryElement<string>>(property.Value.GetRawText()));
             }
             additionalProperties = additionalPropertiesDictionary;
             return new PaypalObjectDataset(type, description.Value, structure.Value, schema.Value, linkedServiceName, Optional.ToDictionary(parameters), Optional.ToList(annotations), folder.Value, additionalProperties, tableName.Value);
diff --git a/src/AzureDataFactory.TestingFramework/Generated/Models/PaypalObjectDataset.cs b/src/AzureDataFactory.TestingFramework/Generated/Models/PaypalObjectDataset.cs
index 9e9f2e5a..66b29588 100644
--- a/src/AzureDataFactory.TestingFramework/Generated/Models/PaypalObjectDataset.cs
+++ b/src/AzureDataFactory.TestingFramework/Generated/Models/PaypalObjectDataset.cs
@@ -34,7 +34,7 @@ public PaypalObjectDataset(DataFactoryLinkedServiceReference linkedServiceName)
         /// <param name="folder"> The folder that this Dataset is in. If not specified, Dataset will appear at the root level. </param>
         /// <param name="additionalProperties"> Additional Properties. </param>
         /// <param name="tableName"> The table name. Type: string (or Expression with resultType string). </param>
-        internal PaypalObjectDataset(string datasetType, string description, DataFactoryElement<IList<DatasetDataElement>> structure, DataFactoryElement<IList<DatasetSchemaDataElement>> schema, DataFactoryLinkedServiceReference linkedServiceName, IDictionary<string, EntityParameterSpecification> parameters, IList<BinaryData> annotations, DatasetFolder folder, IDictionary<string, BinaryData> additionalProperties, DataFactoryElement<string> tableName) : base(datasetType, description, structure, schema, linkedServiceName, parameters, annotations, folder, additionalProperties)
+        internal PaypalObjectDataset(string datasetType, string description, DataFactoryElement<IList<DatasetDataElement>> structure, DataFactoryElement<IList<DatasetSchemaDataElement>> schema, DataFactoryLinkedServiceReference linkedServiceName, IDictionary<string, EntityParameterSpecification> parameters, IList<BinaryData> annotations, DatasetFolder folder, IDictionary<string, DataFactoryElement<string>> additionalProperties, DataFactoryElement<string> tableName) : base(datasetType, description, structure, schema, linkedServiceName, parameters, annotations, folder, additionalProperties)
         {
             TableName = tableName;
             DatasetType = datasetType ?? "PaypalObject";
diff --git a/src/AzureDataFactory.TestingFramework/Generated/Models/PaypalSource.Serialization.cs b/src/AzureDataFactory.TestingFramework/Generated/Models/PaypalSource.Serialization.cs
index d499d449..b2429250 100644
--- a/src/AzureDataFactory.TestingFramework/Generated/Models/PaypalSource.Serialization.cs
+++ b/src/AzureDataFactory.TestingFramework/Generated/Models/PaypalSource.Serialization.cs
@@ -83,8 +83,8 @@ internal static PaypalSource DeserializePaypalSource(JsonElement element)
             Optional<DataFactoryElement<string>> sourceRetryWait = default;
             Optional<DataFactoryElement<int>> maxConcurrentConnections = default;
             Optional<DataFactoryElement<bool>> disableMetricsCollection = default;
-            IDictionary<string, BinaryData> additionalProperties = default;
-            Dictionary<string, BinaryData> additionalPropertiesDictionary = new Dictionary<string, BinaryData>();
+            IDictionary<string, DataFactoryElement<string>> additionalProperties = default;
+            Dictionary<string, DataFactoryElement<string>> additionalPropertiesDictionary = new Dictionary<string, DataFactoryElement<string>>();
             foreach (var property in element.EnumerateObject())
             {
                 if (property.NameEquals("query"u8))
@@ -155,7 +155,7 @@ internal static PaypalSource DeserializePaypalSource(JsonElement element)
                     disableMetricsCollection = JsonSerializer.Deserialize<DataFactoryElement<bool>>(property.Value.GetRawText());
                     continue;
                 }
-                additionalPropertiesDictionary.Add(property.Name, BinaryData.FromString(property.Value.GetRawText()));
+                additionalPropertiesDictionary.Add(property.Name, JsonSerializer.Deserialize<DataFactoryElement<string>>(property.Value.GetRawText()));
             }
             additionalProperties = additionalPropertiesDictionary;
             return new PaypalSource(type, sourceRetryCount.Value, sourceRetryWait.Value, maxConcurrentConnections.Value, disableMetricsCollection.Value, additionalProperties, queryTimeout.Value, additionalColumns.Value, query.Value);
diff --git a/src/AzureDataFactory.TestingFramework/Generated/Models/PaypalSource.cs b/src/AzureDataFactory.TestingFramework/Generated/Models/PaypalSource.cs
index 4fc8726c..7d1a1540 100644
--- a/src/AzureDataFactory.TestingFramework/Generated/Models/PaypalSource.cs
+++ b/src/AzureDataFactory.TestingFramework/Generated/Models/PaypalSource.cs
@@ -28,7 +28,7 @@ public PaypalSource()
         /// <param name="queryTimeout"> Query timeout. Type: string (or Expression with resultType string), pattern: ((\d+)\.)?(\d\d):(60|([0-5][0-9])):(60|([0-5][0-9])). </param>
         /// <param name="additionalColumns"> Specifies the additional columns to be added to source data. Type: array of objects(AdditionalColumns) (or Expression with resultType array of objects). </param>
         /// <param name="query"> A query to retrieve data from source. Type: string (or Expression with resultType string). </param>
-        internal PaypalSource(string copySourceType, DataFactoryElement<int> sourceRetryCount, DataFactoryElement<string> sourceRetryWait, DataFactoryElement<int> maxConcurrentConnections, DataFactoryElement<bool> disableMetricsCollection, IDictionary<string, BinaryData> additionalProperties, DataFactoryElement<string> queryTimeout, BinaryData additionalColumns, DataFactoryElement<string> query) : base(copySourceType, sourceRetryCount, sourceRetryWait, maxConcurrentConnections, disableMetricsCollection, additionalProperties, queryTimeout, additionalColumns)
+        internal PaypalSource(string copySourceType, DataFactoryElement<int> sourceRetryCount, DataFactoryElement<string> sourceRetryWait, DataFactoryElement<int> maxConcurrentConnections, DataFactoryElement<bool> disableMetricsCollection, IDictionary<string, DataFactoryElement<string>> additionalProperties, DataFactoryElement<string> queryTimeout, BinaryData additionalColumns, DataFactoryElement<string> query) : base(copySourceType, sourceRetryCount, sourceRetryWait, maxConcurrentConnections, disableMetricsCollection, additionalProperties, queryTimeout, additionalColumns)
         {
             Query = query;
             CopySourceType = copySourceType ?? "PaypalSource";
diff --git a/src/AzureDataFactory.TestingFramework/Generated/Models/PhoenixLinkedService.Serialization.cs b/src/AzureDataFactory.TestingFramework/Generated/Models/PhoenixLinkedService.Serialization.cs
index 4bfe61b2..a07e747a 100644
--- a/src/AzureDataFactory.TestingFramework/Generated/Models/PhoenixLinkedService.Serialization.cs
+++ b/src/AzureDataFactory.TestingFramework/Generated/Models/PhoenixLinkedService.Serialization.cs
@@ -150,8 +150,8 @@ internal static PhoenixLinkedService DeserializePhoenixLinkedService(JsonElement
             Optional<DataFactoryElement<bool>> allowHostNameCNMismatch = default;
             Optional<DataFactoryElement<bool>> allowSelfSignedServerCert = default;
             Optional<string> encryptedCredential = default;
-            IDictionary<string, BinaryData> additionalProperties = default;
-            Dictionary<string, BinaryData> additionalPropertiesDictionary = new Dictionary<string, BinaryData>();
+            IDictionary<string, DataFactoryElement<string>> additionalProperties = default;
+            Dictionary<string, DataFactoryElement<string>> additionalPropertiesDictionary = new Dictionary<string, DataFactoryElement<string>>();
             foreach (var property in element.EnumerateObject())
             {
                 if (property.NameEquals("type"u8))
@@ -316,7 +316,7 @@ internal static PhoenixLinkedService DeserializePhoenixLinkedService(JsonElement
                     }
                     continue;
                 }
-                additionalPropertiesDictionary.Add(property.Name, BinaryData.FromString(property.Value.GetRawText()));
+                additionalPropertiesDictionary.Add(property.Name, JsonSerializer.Deserialize<DataFactoryElement<string>>(property.Value.GetRawText()));
             }
             additionalProperties = additionalPropertiesDictionary;
             return new PhoenixLinkedService(type, connectVia.Value, description.Value, Optional.ToDictionary(parameters), Optional.ToList(annotations), additionalProperties, host, port.Value, httpPath.Value, authenticationType, username.Value, password, enableSsl.Value, trustedCertPath.Value, useSystemTrustStore.Value, allowHostNameCNMismatch.Value, allowSelfSignedServerCert.Value, encryptedCredential.Value);
diff --git a/src/AzureDataFactory.TestingFramework/Generated/Models/PhoenixLinkedService.cs b/src/AzureDataFactory.TestingFramework/Generated/Models/PhoenixLinkedService.cs
index 069509ac..9909f786 100644
--- a/src/AzureDataFactory.TestingFramework/Generated/Models/PhoenixLinkedService.cs
+++ b/src/AzureDataFactory.TestingFramework/Generated/Models/PhoenixLinkedService.cs
@@ -45,7 +45,7 @@ public PhoenixLinkedService(DataFactoryElement<string> host, PhoenixAuthenticati
         /// <param name="allowHostNameCNMismatch"> Specifies whether to require a CA-issued SSL certificate name to match the host name of the server when connecting over SSL. The default value is false. </param>
         /// <param name="allowSelfSignedServerCert"> Specifies whether to allow self-signed certificates from the server. The default value is false. </param>
         /// <param name="encryptedCredential"> The encrypted credential used for authentication. Credentials are encrypted using the integration runtime credential manager. Type: string. </param>
-        internal PhoenixLinkedService(string linkedServiceType, IntegrationRuntimeReference connectVia, string description, IDictionary<string, EntityParameterSpecification> parameters, IList<BinaryData> annotations, IDictionary<string, BinaryData> additionalProperties, DataFactoryElement<string> host, DataFactoryElement<int> port, DataFactoryElement<string> httpPath, PhoenixAuthenticationType authenticationType, DataFactoryElement<string> username, DataFactorySecretBaseDefinition password, DataFactoryElement<bool> enableSsl, DataFactoryElement<string> trustedCertPath, DataFactoryElement<bool> useSystemTrustStore, DataFactoryElement<bool> allowHostNameCNMismatch, DataFactoryElement<bool> allowSelfSignedServerCert, string encryptedCredential) : base(linkedServiceType, connectVia, description, parameters, annotations, additionalProperties)
+        internal PhoenixLinkedService(string linkedServiceType, IntegrationRuntimeReference connectVia, string description, IDictionary<string, EntityParameterSpecification> parameters, IList<BinaryData> annotations, IDictionary<string, DataFactoryElement<string>> additionalProperties, DataFactoryElement<string> host, DataFactoryElement<int> port, DataFactoryElement<string> httpPath, PhoenixAuthenticationType authenticationType, DataFactoryElement<string> username, DataFactorySecretBaseDefinition password, DataFactoryElement<bool> enableSsl, DataFactoryElement<string> trustedCertPath, DataFactoryElement<bool> useSystemTrustStore, DataFactoryElement<bool> allowHostNameCNMismatch, DataFactoryElement<bool> allowSelfSignedServerCert, string encryptedCredential) : base(linkedServiceType, connectVia, description, parameters, annotations, additionalProperties)
         {
             Host = host;
             Port = port;
diff --git a/src/AzureDataFactory.TestingFramework/Generated/Models/PhoenixObjectDataset.Serialization.cs b/src/AzureDataFactory.TestingFramework/Generated/Models/PhoenixObjectDataset.Serialization.cs
index 92ccaa77..ef1b5afe 100644
--- a/src/AzureDataFactory.TestingFramework/Generated/Models/PhoenixObjectDataset.Serialization.cs
+++ b/src/AzureDataFactory.TestingFramework/Generated/Models/PhoenixObjectDataset.Serialization.cs
@@ -120,8 +120,8 @@ internal static PhoenixObjectDataset DeserializePhoenixObjectDataset(JsonElement
             Optional<BinaryData> tableName = default;
             Optional<DataFactoryElement<string>> table = default;
             Optional<DataFactoryElement<string>> schema0 = default;
-            IDictionary<string, BinaryData> additionalProperties = default;
-            Dictionary<string, BinaryData> additionalPropertiesDictionary = new Dictionary<string, BinaryData>();
+            IDictionary<string, DataFactoryElement<string>> additionalProperties = default;
+            Dictionary<string, DataFactoryElement<string>> additionalPropertiesDictionary = new Dictionary<string, DataFactoryElement<string>>();
             foreach (var property in element.EnumerateObject())
             {
                 if (property.NameEquals("type"u8))
@@ -240,7 +240,7 @@ internal static PhoenixObjectDataset DeserializePhoenixObjectDataset(JsonElement
                     }
                     continue;
                 }
-                additionalPropertiesDictionary.Add(property.Name, BinaryData.FromString(property.Value.GetRawText()));
+                additionalPropertiesDictionary.Add(property.Name, JsonSerializer.Deserialize<DataFactoryElement<string>>(property.Value.GetRawText()));
             }
             additionalProperties = additionalPropertiesDictionary;
             return new PhoenixObjectDataset(type, description.Value, structure.Value, schema.Value, linkedServiceName, Optional.ToDictionary(parameters), Optional.ToList(annotations), folder.Value, additionalProperties, tableName.Value, table.Value, schema0.Value);
diff --git a/src/AzureDataFactory.TestingFramework/Generated/Models/PhoenixObjectDataset.cs b/src/AzureDataFactory.TestingFramework/Generated/Models/PhoenixObjectDataset.cs
index 4188c04b..cecacf19 100644
--- a/src/AzureDataFactory.TestingFramework/Generated/Models/PhoenixObjectDataset.cs
+++ b/src/AzureDataFactory.TestingFramework/Generated/Models/PhoenixObjectDataset.cs
@@ -36,7 +36,7 @@ public PhoenixObjectDataset(DataFactoryLinkedServiceReference linkedServiceName)
         /// <param name="tableName"> This property will be retired. Please consider using schema + table properties instead. </param>
         /// <param name="table"> The table name of the Phoenix. Type: string (or Expression with resultType string). </param>
         /// <param name="schemaTypePropertiesSchema"> The schema name of the Phoenix. Type: string (or Expression with resultType string). </param>
-        internal PhoenixObjectDataset(string datasetType, string description, DataFactoryElement<IList<DatasetDataElement>> structure, DataFactoryElement<IList<DatasetSchemaDataElement>> schema, DataFactoryLinkedServiceReference linkedServiceName, IDictionary<string, EntityParameterSpecification> parameters, IList<BinaryData> annotations, DatasetFolder folder, IDictionary<string, BinaryData> additionalProperties, BinaryData tableName, DataFactoryElement<string> table, DataFactoryElement<string> schemaTypePropertiesSchema) : base(datasetType, description, structure, schema, linkedServiceName, parameters, annotations, folder, additionalProperties)
+        internal PhoenixObjectDataset(string datasetType, string description, DataFactoryElement<IList<DatasetDataElement>> structure, DataFactoryElement<IList<DatasetSchemaDataElement>> schema, DataFactoryLinkedServiceReference linkedServiceName, IDictionary<string, EntityParameterSpecification> parameters, IList<BinaryData> annotations, DatasetFolder folder, IDictionary<string, DataFactoryElement<string>> additionalProperties, BinaryData tableName, DataFactoryElement<string> table, DataFactoryElement<string> schemaTypePropertiesSchema) : base(datasetType, description, structure, schema, linkedServiceName, parameters, annotations, folder, additionalProperties)
         {
             TableName = tableName;
             Table = table;
diff --git a/src/AzureDataFactory.TestingFramework/Generated/Models/PhoenixSource.Serialization.cs b/src/AzureDataFactory.TestingFramework/Generated/Models/PhoenixSource.Serialization.cs
index ada0291f..0dd96a66 100644
--- a/src/AzureDataFactory.TestingFramework/Generated/Models/PhoenixSource.Serialization.cs
+++ b/src/AzureDataFactory.TestingFramework/Generated/Models/PhoenixSource.Serialization.cs
@@ -83,8 +83,8 @@ internal static PhoenixSource DeserializePhoenixSource(JsonElement element)
             Optional<DataFactoryElement<string>> sourceRetryWait = default;
             Optional<DataFactoryElement<int>> maxConcurrentConnections = default;
             Optional<DataFactoryElement<bool>> disableMetricsCollection = default;
-            IDictionary<string, BinaryData> additionalProperties = default;
-            Dictionary<string, BinaryData> additionalPropertiesDictionary = new Dictionary<string, BinaryData>();
+            IDictionary<string, DataFactoryElement<string>> additionalProperties = default;
+            Dictionary<string, DataFactoryElement<string>> additionalPropertiesDictionary = new Dictionary<string, DataFactoryElement<string>>();
             foreach (var property in element.EnumerateObject())
             {
                 if (property.NameEquals("query"u8))
@@ -155,7 +155,7 @@ internal static PhoenixSource DeserializePhoenixSource(JsonElement element)
                     disableMetricsCollection = JsonSerializer.Deserialize<DataFactoryElement<bool>>(property.Value.GetRawText());
                     continue;
                 }
-                additionalPropertiesDictionary.Add(property.Name, BinaryData.FromString(property.Value.GetRawText()));
+                additionalPropertiesDictionary.Add(property.Name, JsonSerializer.Deserialize<DataFactoryElement<string>>(property.Value.GetRawText()));
             }
             additionalProperties = additionalPropertiesDictionary;
             return new PhoenixSource(type, sourceRetryCount.Value, sourceRetryWait.Value, maxConcurrentConnections.Value, disableMetricsCollection.Value, additionalProperties, queryTimeout.Value, additionalColumns.Value, query.Value);
diff --git a/src/AzureDataFactory.TestingFramework/Generated/Models/PhoenixSource.cs b/src/AzureDataFactory.TestingFramework/Generated/Models/PhoenixSource.cs
index 9331e073..640516d4 100644
--- a/src/AzureDataFactory.TestingFramework/Generated/Models/PhoenixSource.cs
+++ b/src/AzureDataFactory.TestingFramework/Generated/Models/PhoenixSource.cs
@@ -28,7 +28,7 @@ public PhoenixSource()
         /// <param name="queryTimeout"> Query timeout. Type: string (or Expression with resultType string), pattern: ((\d+)\.)?(\d\d):(60|([0-5][0-9])):(60|([0-5][0-9])). </param>
         /// <param name="additionalColumns"> Specifies the additional columns to be added to source data. Type: array of objects(AdditionalColumns) (or Expression with resultType array of objects). </param>
         /// <param name="query"> A query to retrieve data from source. Type: string (or Expression with resultType string). </param>
-        internal PhoenixSource(string copySourceType, DataFactoryElement<int> sourceRetryCount, DataFactoryElement<string> sourceRetryWait, DataFactoryElement<int> maxConcurrentConnections, DataFactoryElement<bool> disableMetricsCollection, IDictionary<string, BinaryData> additionalProperties, DataFactoryElement<string> queryTimeout, BinaryData additionalColumns, DataFactoryElement<string> query) : base(copySourceType, sourceRetryCount, sourceRetryWait, maxConcurrentConnections, disableMetricsCollection, additionalProperties, queryTimeout, additionalColumns)
+        internal PhoenixSource(string copySourceType, DataFactoryElement<int> sourceRetryCount, DataFactoryElement<string> sourceRetryWait, DataFactoryElement<int> maxConcurrentConnections, DataFactoryElement<bool> disableMetricsCollection, IDictionary<string, DataFactoryElement<string>> additionalProperties, DataFactoryElement<string> queryTimeout, BinaryData additionalColumns, DataFactoryElement<string> query) : base(copySourceType, sourceRetryCount, sourceRetryWait, maxConcurrentConnections, disableMetricsCollection, additionalProperties, queryTimeout, additionalColumns)
         {
             Query = query;
             CopySourceType = copySourceType ?? "PhoenixSource";
diff --git a/src/AzureDataFactory.TestingFramework/Generated/Models/PipelineActivity.cs b/src/AzureDataFactory.TestingFramework/Generated/Models/PipelineActivity.cs
index e5eeea12..72604d48 100644
--- a/src/AzureDataFactory.TestingFramework/Generated/Models/PipelineActivity.cs
+++ b/src/AzureDataFactory.TestingFramework/Generated/Models/PipelineActivity.cs
@@ -6,6 +6,7 @@
 #nullable disable
 
 using Azure.Core;
+using Azure.Core.Expressions.DataFactory;
 
 namespace AzureDataFactory.TestingFramework.Models
 {
@@ -26,7 +27,7 @@ public PipelineActivity(string name)
             Name = name;
             DependsOn = new ChangeTrackingList<PipelineActivityDependency>();
             UserProperties = new ChangeTrackingList<PipelineActivityUserProperty>();
-            AdditionalProperties = new ChangeTrackingDictionary<string, BinaryData>();
+            AdditionalProperties = new ChangeTrackingDictionary<string, DataFactoryElement<string>>();
         }
 
         /// <summary> Initializes a new instance of PipelineActivity. </summary>
@@ -38,7 +39,7 @@ public PipelineActivity(string name)
         /// <param name="dependsOn"> Activity depends on condition. </param>
         /// <param name="userProperties"> Activity user properties. </param>
         /// <param name="additionalProperties"> Additional Properties. </param>
-        internal PipelineActivity(string name, string activityType, string description, PipelineActivityState? state, ActivityOnInactiveMarkAs? onInactiveMarkAs, IList<PipelineActivityDependency> dependsOn, IList<PipelineActivityUserProperty> userProperties, IDictionary<string, BinaryData> additionalProperties)
+        internal PipelineActivity(string name, string activityType, string description, PipelineActivityState? state, ActivityOnInactiveMarkAs? onInactiveMarkAs, IList<PipelineActivityDependency> dependsOn, IList<PipelineActivityUserProperty> userProperties, IDictionary<string, DataFactoryElement<string>> additionalProperties)
         {
             Name = name;
             ActivityType = activityType;
@@ -94,6 +95,6 @@ internal PipelineActivity(string name, string activityType, string description,
         /// </list>
         /// </para>
         /// </summary>
-        public IDictionary<string, BinaryData> AdditionalProperties { get; }
+        public IDictionary<string, DataFactoryElement<string>> AdditionalProperties { get; }
     }
 }
diff --git a/src/AzureDataFactory.TestingFramework/Generated/Models/PipelineActivityDependency.Serialization.cs b/src/AzureDataFactory.TestingFramework/Generated/Models/PipelineActivityDependency.Serialization.cs
index 81aa9ccf..4d586d13 100644
--- a/src/AzureDataFactory.TestingFramework/Generated/Models/PipelineActivityDependency.Serialization.cs
+++ b/src/AzureDataFactory.TestingFramework/Generated/Models/PipelineActivityDependency.Serialization.cs
@@ -7,6 +7,7 @@
 
 using System.Text.Json;
 using Azure.Core;
+using Azure.Core.Expressions.DataFactory;
 
 namespace AzureDataFactory.TestingFramework.Models
 {
@@ -44,8 +45,8 @@ internal static PipelineActivityDependency DeserializePipelineActivityDependency
             }
             string activity = default;
             IList<DependencyCondition> dependencyConditions = default;
-            IDictionary<string, BinaryData> additionalProperties = default;
-            Dictionary<string, BinaryData> additionalPropertiesDictionary = new Dictionary<string, BinaryData>();
+            IDictionary<string, DataFactoryElement<string>> additionalProperties = default;
+            Dictionary<string, DataFactoryElement<string>> additionalPropertiesDictionary = new Dictionary<string, DataFactoryElement<string>>();
             foreach (var property in element.EnumerateObject())
             {
                 if (property.NameEquals("activity"u8))
@@ -63,7 +64,7 @@ internal static PipelineActivityDependency DeserializePipelineActivityDependency
                     dependencyConditions = array;
                     continue;
                 }
-                additionalPropertiesDictionary.Add(property.Name, BinaryData.FromString(property.Value.GetRawText()));
+                additionalPropertiesDictionary.Add(property.Name, JsonSerializer.Deserialize<DataFactoryElement<string>>(property.Value.GetRawText()));
             }
             additionalProperties = additionalPropertiesDictionary;
             return new PipelineActivityDependency(activity, dependencyConditions, additionalProperties);
diff --git a/src/AzureDataFactory.TestingFramework/Generated/Models/PipelineActivityDependency.cs b/src/AzureDataFactory.TestingFramework/Generated/Models/PipelineActivityDependency.cs
index 47f55a8f..77bb1048 100644
--- a/src/AzureDataFactory.TestingFramework/Generated/Models/PipelineActivityDependency.cs
+++ b/src/AzureDataFactory.TestingFramework/Generated/Models/PipelineActivityDependency.cs
@@ -6,6 +6,7 @@
 #nullable disable
 
 using Azure.Core;
+using Azure.Core.Expressions.DataFactory;
 
 namespace AzureDataFactory.TestingFramework.Models
 {
@@ -23,14 +24,14 @@ public PipelineActivityDependency(string activity, IEnumerable<DependencyConditi
 
             Activity = activity;
             DependencyConditions = dependencyConditions.ToList();
-            AdditionalProperties = new ChangeTrackingDictionary<string, BinaryData>();
+            AdditionalProperties = new ChangeTrackingDictionary<string, DataFactoryElement<string>>();
         }
 
         /// <summary> Initializes a new instance of PipelineActivityDependency. </summary>
         /// <param name="activity"> Activity name. </param>
         /// <param name="dependencyConditions"> Match-Condition for the dependency. </param>
         /// <param name="additionalProperties"> Additional Properties. </param>
-        internal PipelineActivityDependency(string activity, IList<DependencyCondition> dependencyConditions, IDictionary<string, BinaryData> additionalProperties)
+        internal PipelineActivityDependency(string activity, IList<DependencyCondition> dependencyConditions, IDictionary<string, DataFactoryElement<string>> additionalProperties)
         {
             Activity = activity;
             DependencyConditions = dependencyConditions;
@@ -71,6 +72,6 @@ internal PipelineActivityDependency(string activity, IList<DependencyCondition>
         /// </list>
         /// </para>
         /// </summary>
-        public IDictionary<string, BinaryData> AdditionalProperties { get; }
+        public IDictionary<string, DataFactoryElement<string>> AdditionalProperties { get; }
     }
 }
diff --git a/src/AzureDataFactory.TestingFramework/Generated/Models/PipelineActivityPolicy.Serialization.cs b/src/AzureDataFactory.TestingFramework/Generated/Models/PipelineActivityPolicy.Serialization.cs
index 0049dfc8..416d11e6 100644
--- a/src/AzureDataFactory.TestingFramework/Generated/Models/PipelineActivityPolicy.Serialization.cs
+++ b/src/AzureDataFactory.TestingFramework/Generated/Models/PipelineActivityPolicy.Serialization.cs
@@ -64,8 +64,8 @@ internal static PipelineActivityPolicy DeserializePipelineActivityPolicy(JsonEle
             Optional<int> retryIntervalInSeconds = default;
             Optional<bool> secureInput = default;
             Optional<bool> secureOutput = default;
-            IDictionary<string, BinaryData> additionalProperties = default;
-            Dictionary<string, BinaryData> additionalPropertiesDictionary = new Dictionary<string, BinaryData>();
+            IDictionary<string, DataFactoryElement<string>> additionalProperties = default;
+            Dictionary<string, DataFactoryElement<string>> additionalPropertiesDictionary = new Dictionary<string, DataFactoryElement<string>>();
             foreach (var property in element.EnumerateObject())
             {
                 if (property.NameEquals("timeout"u8))
@@ -113,7 +113,7 @@ internal static PipelineActivityPolicy DeserializePipelineActivityPolicy(JsonEle
                     secureOutput = property.Value.GetBoolean();
                     continue;
                 }
-                additionalPropertiesDictionary.Add(property.Name, BinaryData.FromString(property.Value.GetRawText()));
+                additionalPropertiesDictionary.Add(property.Name, JsonSerializer.Deserialize<DataFactoryElement<string>>(property.Value.GetRawText()));
             }
             additionalProperties = additionalPropertiesDictionary;
             return new PipelineActivityPolicy(timeout.Value, retry.Value, Optional.ToNullable(retryIntervalInSeconds), Optional.ToNullable(secureInput), Optional.ToNullable(secureOutput), additionalProperties);
diff --git a/src/AzureDataFactory.TestingFramework/Generated/Models/PipelineActivityPolicy.cs b/src/AzureDataFactory.TestingFramework/Generated/Models/PipelineActivityPolicy.cs
index fb09d350..13734604 100644
--- a/src/AzureDataFactory.TestingFramework/Generated/Models/PipelineActivityPolicy.cs
+++ b/src/AzureDataFactory.TestingFramework/Generated/Models/PipelineActivityPolicy.cs
@@ -16,7 +16,7 @@ public partial class PipelineActivityPolicy
         /// <summary> Initializes a new instance of PipelineActivityPolicy. </summary>
         public PipelineActivityPolicy()
         {
-            AdditionalProperties = new ChangeTrackingDictionary<string, BinaryData>();
+            AdditionalProperties = new ChangeTrackingDictionary<string, DataFactoryElement<string>>();
         }
 
         /// <summary> Initializes a new instance of PipelineActivityPolicy. </summary>
@@ -26,7 +26,7 @@ public PipelineActivityPolicy()
         /// <param name="isSecureInputEnabled"> When set to true, Input from activity is considered as secure and will not be logged to monitoring. </param>
         /// <param name="isSecureOutputEnabled"> When set to true, Output from activity is considered as secure and will not be logged to monitoring. </param>
         /// <param name="additionalProperties"> Additional Properties. </param>
-        internal PipelineActivityPolicy(DataFactoryElement<string> timeout, DataFactoryElement<int> retry, int? retryIntervalInSeconds, bool? isSecureInputEnabled, bool? isSecureOutputEnabled, IDictionary<string, BinaryData> additionalProperties)
+        internal PipelineActivityPolicy(DataFactoryElement<string> timeout, DataFactoryElement<int> retry, int? retryIntervalInSeconds, bool? isSecureInputEnabled, bool? isSecureOutputEnabled, IDictionary<string, DataFactoryElement<string>> additionalProperties)
         {
             Timeout = timeout;
             Retry = retry;
@@ -76,6 +76,6 @@ internal PipelineActivityPolicy(DataFactoryElement<string> timeout, DataFactoryE
         /// </list>
         /// </para>
         /// </summary>
-        public IDictionary<string, BinaryData> AdditionalProperties { get; }
+        public IDictionary<string, DataFactoryElement<string>> AdditionalProperties { get; }
     }
 }
diff --git a/src/AzureDataFactory.TestingFramework/Generated/Models/PipelineActivityRunInformation.Serialization.cs b/src/AzureDataFactory.TestingFramework/Generated/Models/PipelineActivityRunInformation.Serialization.cs
index a51dbad1..fe3be808 100644
--- a/src/AzureDataFactory.TestingFramework/Generated/Models/PipelineActivityRunInformation.Serialization.cs
+++ b/src/AzureDataFactory.TestingFramework/Generated/Models/PipelineActivityRunInformation.Serialization.cs
@@ -7,6 +7,7 @@
 
 using System.Text.Json;
 using Azure.Core;
+using Azure.Core.Expressions.DataFactory;
 
 namespace AzureDataFactory.TestingFramework.Models
 {
@@ -31,8 +32,8 @@ internal static PipelineActivityRunInformation DeserializePipelineActivityRunInf
             Optional<BinaryData> input = default;
             Optional<BinaryData> output = default;
             Optional<BinaryData> error = default;
-            IReadOnlyDictionary<string, BinaryData> additionalProperties = default;
-            Dictionary<string, BinaryData> additionalPropertiesDictionary = new Dictionary<string, BinaryData>();
+            IReadOnlyDictionary<string, DataFactoryElement<string>> additionalProperties = default;
+            Dictionary<string, DataFactoryElement<string>> additionalPropertiesDictionary = new Dictionary<string, DataFactoryElement<string>>();
             foreach (var property in element.EnumerateObject())
             {
                 if (property.NameEquals("pipelineName"u8))
@@ -132,7 +133,7 @@ internal static PipelineActivityRunInformation DeserializePipelineActivityRunInf
                     error = BinaryData.FromString(property.Value.GetRawText());
                     continue;
                 }
-                additionalPropertiesDictionary.Add(property.Name, BinaryData.FromString(property.Value.GetRawText()));
+                additionalPropertiesDictionary.Add(property.Name, JsonSerializer.Deserialize<DataFactoryElement<string>>(property.Value.GetRawText()));
             }
             additionalProperties = additionalPropertiesDictionary;
             return new PipelineActivityRunInformation(pipelineName.Value, Optional.ToNullable(pipelineRunId), activityName.Value, activityType.Value, Optional.ToNullable(activityRunId), linkedServiceName.Value, status.Value, Optional.ToNullable(activityRunStart), Optional.ToNullable(activityRunEnd), Optional.ToNullable(durationInMs), input.Value, output.Value, error.Value, additionalProperties);
diff --git a/src/AzureDataFactory.TestingFramework/Generated/Models/PipelineActivityRunInformation.cs b/src/AzureDataFactory.TestingFramework/Generated/Models/PipelineActivityRunInformation.cs
index 355fa48d..d9e980b0 100644
--- a/src/AzureDataFactory.TestingFramework/Generated/Models/PipelineActivityRunInformation.cs
+++ b/src/AzureDataFactory.TestingFramework/Generated/Models/PipelineActivityRunInformation.cs
@@ -6,6 +6,7 @@
 #nullable disable
 
 using Azure.Core;
+using Azure.Core.Expressions.DataFactory;
 
 namespace AzureDataFactory.TestingFramework.Models
 {
@@ -15,7 +16,7 @@ public partial class PipelineActivityRunInformation
         /// <summary> Initializes a new instance of PipelineActivityRunInformation. </summary>
         internal PipelineActivityRunInformation()
         {
-            AdditionalProperties = new ChangeTrackingDictionary<string, BinaryData>();
+            AdditionalProperties = new ChangeTrackingDictionary<string, DataFactoryElement<string>>();
         }
 
         /// <summary> Initializes a new instance of PipelineActivityRunInformation. </summary>
@@ -33,7 +34,7 @@ internal PipelineActivityRunInformation()
         /// <param name="output"> The output for the activity. </param>
         /// <param name="error"> The error if any from the activity run. </param>
         /// <param name="additionalProperties"> Additional Properties. </param>
-        internal PipelineActivityRunInformation(string pipelineName, Guid? pipelineRunId, string activityName, string activityType, Guid? activityRunId, string linkedServiceName, string status, DateTimeOffset? startOn, DateTimeOffset? endOn, int? durationInMs, BinaryData input, BinaryData output, BinaryData error, IReadOnlyDictionary<string, BinaryData> additionalProperties)
+        internal PipelineActivityRunInformation(string pipelineName, Guid? pipelineRunId, string activityName, string activityType, Guid? activityRunId, string linkedServiceName, string status, DateTimeOffset? startOn, DateTimeOffset? endOn, int? durationInMs, BinaryData input, BinaryData output, BinaryData error, IReadOnlyDictionary<string, DataFactoryElement<string>> additionalProperties)
         {
             PipelineName = pipelineName;
             PipelineRunId = pipelineRunId;
@@ -194,6 +195,6 @@ internal PipelineActivityRunInformation(string pipelineName, Guid? pipelineRunId
         /// </list>
         /// </para>
         /// </summary>
-        public IReadOnlyDictionary<string, BinaryData> AdditionalProperties { get; }
+        public IReadOnlyDictionary<string, DataFactoryElement<string>> AdditionalProperties { get; }
     }
 }
diff --git a/src/AzureDataFactory.TestingFramework/Generated/Models/PipelineExternalComputeScaleProperties.Serialization.cs b/src/AzureDataFactory.TestingFramework/Generated/Models/PipelineExternalComputeScaleProperties.Serialization.cs
index be851a13..eb211e34 100644
--- a/src/AzureDataFactory.TestingFramework/Generated/Models/PipelineExternalComputeScaleProperties.Serialization.cs
+++ b/src/AzureDataFactory.TestingFramework/Generated/Models/PipelineExternalComputeScaleProperties.Serialization.cs
@@ -7,6 +7,7 @@
 
 using System.Text.Json;
 using Azure.Core;
+using Azure.Core.Expressions.DataFactory;
 
 namespace AzureDataFactory.TestingFramework.Models
 {
@@ -39,8 +40,8 @@ internal static PipelineExternalComputeScaleProperties DeserializePipelineExtern
                 return null;
             }
             Optional<int> timeToLive = default;
-            IDictionary<string, BinaryData> additionalProperties = default;
-            Dictionary<string, BinaryData> additionalPropertiesDictionary = new Dictionary<string, BinaryData>();
+            IDictionary<string, DataFactoryElement<string>> additionalProperties = default;
+            Dictionary<string, DataFactoryElement<string>> additionalPropertiesDictionary = new Dictionary<string, DataFactoryElement<string>>();
             foreach (var property in element.EnumerateObject())
             {
                 if (property.NameEquals("timeToLive"u8))
@@ -52,7 +53,7 @@ internal static PipelineExternalComputeScaleProperties DeserializePipelineExtern
                     timeToLive = property.Value.GetInt32();
                     continue;
                 }
-                additionalPropertiesDictionary.Add(property.Name, BinaryData.FromString(property.Value.GetRawText()));
+                additionalPropertiesDictionary.Add(property.Name, JsonSerializer.Deserialize<DataFactoryElement<string>>(property.Value.GetRawText()));
             }
             additionalProperties = additionalPropertiesDictionary;
             return new PipelineExternalComputeScaleProperties(Optional.ToNullable(timeToLive), additionalProperties);
diff --git a/src/AzureDataFactory.TestingFramework/Generated/Models/PipelineExternalComputeScaleProperties.cs b/src/AzureDataFactory.TestingFramework/Generated/Models/PipelineExternalComputeScaleProperties.cs
index 5217378e..65acc68a 100644
--- a/src/AzureDataFactory.TestingFramework/Generated/Models/PipelineExternalComputeScaleProperties.cs
+++ b/src/AzureDataFactory.TestingFramework/Generated/Models/PipelineExternalComputeScaleProperties.cs
@@ -6,6 +6,7 @@
 #nullable disable
 
 using Azure.Core;
+using Azure.Core.Expressions.DataFactory;
 
 namespace AzureDataFactory.TestingFramework.Models
 {
@@ -15,13 +16,13 @@ public partial class PipelineExternalComputeScaleProperties
         /// <summary> Initializes a new instance of PipelineExternalComputeScaleProperties. </summary>
         public PipelineExternalComputeScaleProperties()
         {
-            AdditionalProperties = new ChangeTrackingDictionary<string, BinaryData>();
+            AdditionalProperties = new ChangeTrackingDictionary<string, DataFactoryElement<string>>();
         }
 
         /// <summary> Initializes a new instance of PipelineExternalComputeScaleProperties. </summary>
         /// <param name="timeToLive"> Time to live (in minutes) setting of integration runtime which will execute pipeline and external activity. </param>
         /// <param name="additionalProperties"> Additional Properties. </param>
-        internal PipelineExternalComputeScaleProperties(int? timeToLive, IDictionary<string, BinaryData> additionalProperties)
+        internal PipelineExternalComputeScaleProperties(int? timeToLive, IDictionary<string, DataFactoryElement<string>> additionalProperties)
         {
             TimeToLive = timeToLive;
             AdditionalProperties = additionalProperties;
@@ -59,6 +60,6 @@ internal PipelineExternalComputeScaleProperties(int? timeToLive, IDictionary<str
         /// </list>
         /// </para>
         /// </summary>
-        public IDictionary<string, BinaryData> AdditionalProperties { get; }
+        public IDictionary<string, DataFactoryElement<string>> AdditionalProperties { get; }
     }
 }
diff --git a/src/AzureDataFactory.TestingFramework/Generated/Models/PolybaseSettings.Serialization.cs b/src/AzureDataFactory.TestingFramework/Generated/Models/PolybaseSettings.Serialization.cs
index 9db16951..24f7f297 100644
--- a/src/AzureDataFactory.TestingFramework/Generated/Models/PolybaseSettings.Serialization.cs
+++ b/src/AzureDataFactory.TestingFramework/Generated/Models/PolybaseSettings.Serialization.cs
@@ -62,8 +62,8 @@ internal static PolybaseSettings DeserializePolybaseSettings(JsonElement element
             Optional<BinaryData> rejectValue = default;
             Optional<DataFactoryElement<int>> rejectSampleValue = default;
             Optional<DataFactoryElement<bool>> useTypeDefault = default;
-            IDictionary<string, BinaryData> additionalProperties = default;
-            Dictionary<string, BinaryData> additionalPropertiesDictionary = new Dictionary<string, BinaryData>();
+            IDictionary<string, DataFactoryElement<string>> additionalProperties = default;
+            Dictionary<string, DataFactoryElement<string>> additionalPropertiesDictionary = new Dictionary<string, DataFactoryElement<string>>();
             foreach (var property in element.EnumerateObject())
             {
                 if (property.NameEquals("rejectType"u8))
@@ -102,7 +102,7 @@ internal static PolybaseSettings DeserializePolybaseSettings(JsonElement element
                     useTypeDefault = JsonSerializer.Deserialize<DataFactoryElement<bool>>(property.Value.GetRawText());
                     continue;
                 }
-                additionalPropertiesDictionary.Add(property.Name, BinaryData.FromString(property.Value.GetRawText()));
+                additionalPropertiesDictionary.Add(property.Name, JsonSerializer.Deserialize<DataFactoryElement<string>>(property.Value.GetRawText()));
             }
             additionalProperties = additionalPropertiesDictionary;
             return new PolybaseSettings(Optional.ToNullable(rejectType), rejectValue.Value, rejectSampleValue.Value, useTypeDefault.Value, additionalProperties);
diff --git a/src/AzureDataFactory.TestingFramework/Generated/Models/PolybaseSettings.cs b/src/AzureDataFactory.TestingFramework/Generated/Models/PolybaseSettings.cs
index 66539ed9..fd80fa89 100644
--- a/src/AzureDataFactory.TestingFramework/Generated/Models/PolybaseSettings.cs
+++ b/src/AzureDataFactory.TestingFramework/Generated/Models/PolybaseSettings.cs
@@ -16,7 +16,7 @@ public partial class PolybaseSettings
         /// <summary> Initializes a new instance of PolybaseSettings. </summary>
         public PolybaseSettings()
         {
-            AdditionalProperties = new ChangeTrackingDictionary<string, BinaryData>();
+            AdditionalProperties = new ChangeTrackingDictionary<string, DataFactoryElement<string>>();
         }
 
         /// <summary> Initializes a new instance of PolybaseSettings. </summary>
@@ -25,7 +25,7 @@ public PolybaseSettings()
         /// <param name="rejectSampleValue"> Determines the number of rows to attempt to retrieve before the PolyBase recalculates the percentage of rejected rows. Type: integer (or Expression with resultType integer), minimum: 0. </param>
         /// <param name="useTypeDefault"> Specifies how to handle missing values in delimited text files when PolyBase retrieves data from the text file. Type: boolean (or Expression with resultType boolean). </param>
         /// <param name="additionalProperties"> Additional Properties. </param>
-        internal PolybaseSettings(PolybaseSettingsRejectType? rejectType, BinaryData rejectValue, DataFactoryElement<int> rejectSampleValue, DataFactoryElement<bool> useTypeDefault, IDictionary<string, BinaryData> additionalProperties)
+        internal PolybaseSettings(PolybaseSettingsRejectType? rejectType, BinaryData rejectValue, DataFactoryElement<int> rejectSampleValue, DataFactoryElement<bool> useTypeDefault, IDictionary<string, DataFactoryElement<string>> additionalProperties)
         {
             RejectType = rejectType;
             RejectValue = rejectValue;
@@ -101,6 +101,6 @@ internal PolybaseSettings(PolybaseSettingsRejectType? rejectType, BinaryData rej
         /// </list>
         /// </para>
         /// </summary>
-        public IDictionary<string, BinaryData> AdditionalProperties { get; }
+        public IDictionary<string, DataFactoryElement<string>> AdditionalProperties { get; }
     }
 }
diff --git a/src/AzureDataFactory.TestingFramework/Generated/Models/PostgreSqlLinkedService.Serialization.cs b/src/AzureDataFactory.TestingFramework/Generated/Models/PostgreSqlLinkedService.Serialization.cs
index f8389a7f..741933d1 100644
--- a/src/AzureDataFactory.TestingFramework/Generated/Models/PostgreSqlLinkedService.Serialization.cs
+++ b/src/AzureDataFactory.TestingFramework/Generated/Models/PostgreSqlLinkedService.Serialization.cs
@@ -99,8 +99,8 @@ internal static PostgreSqlLinkedService DeserializePostgreSqlLinkedService(JsonE
             DataFactoryElement<string> connectionString = default;
             Optional<DataFactoryKeyVaultSecretReference> password = default;
             Optional<string> encryptedCredential = default;
-            IDictionary<string, BinaryData> additionalProperties = default;
-            Dictionary<string, BinaryData> additionalPropertiesDictionary = new Dictionary<string, BinaryData>();
+            IDictionary<string, DataFactoryElement<string>> additionalProperties = default;
+            Dictionary<string, DataFactoryElement<string>> additionalPropertiesDictionary = new Dictionary<string, DataFactoryElement<string>>();
             foreach (var property in element.EnumerateObject())
             {
                 if (property.NameEquals("type"u8))
@@ -188,7 +188,7 @@ internal static PostgreSqlLinkedService DeserializePostgreSqlLinkedService(JsonE
                     }
                     continue;
                 }
-                additionalPropertiesDictionary.Add(property.Name, BinaryData.FromString(property.Value.GetRawText()));
+                additionalPropertiesDictionary.Add(property.Name, JsonSerializer.Deserialize<DataFactoryElement<string>>(property.Value.GetRawText()));
             }
             additionalProperties = additionalPropertiesDictionary;
             return new PostgreSqlLinkedService(type, connectVia.Value, description.Value, Optional.ToDictionary(parameters), Optional.ToList(annotations), additionalProperties, connectionString, password, encryptedCredential.Value);
diff --git a/src/AzureDataFactory.TestingFramework/Generated/Models/PostgreSqlLinkedService.cs b/src/AzureDataFactory.TestingFramework/Generated/Models/PostgreSqlLinkedService.cs
index d97a0097..7fc9f7f6 100644
--- a/src/AzureDataFactory.TestingFramework/Generated/Models/PostgreSqlLinkedService.cs
+++ b/src/AzureDataFactory.TestingFramework/Generated/Models/PostgreSqlLinkedService.cs
@@ -34,7 +34,7 @@ public PostgreSqlLinkedService(DataFactoryElement<string> connectionString)
         /// <param name="connectionString"> The connection string. Type: string, SecureString or AzureKeyVaultSecretReference. </param>
         /// <param name="password"> The Azure key vault secret reference of password in connection string. </param>
         /// <param name="encryptedCredential"> The encrypted credential used for authentication. Credentials are encrypted using the integration runtime credential manager. Type: string. </param>
-        internal PostgreSqlLinkedService(string linkedServiceType, IntegrationRuntimeReference connectVia, string description, IDictionary<string, EntityParameterSpecification> parameters, IList<BinaryData> annotations, IDictionary<string, BinaryData> additionalProperties, DataFactoryElement<string> connectionString, DataFactoryKeyVaultSecretReference password, string encryptedCredential) : base(linkedServiceType, connectVia, description, parameters, annotations, additionalProperties)
+        internal PostgreSqlLinkedService(string linkedServiceType, IntegrationRuntimeReference connectVia, string description, IDictionary<string, EntityParameterSpecification> parameters, IList<BinaryData> annotations, IDictionary<string, DataFactoryElement<string>> additionalProperties, DataFactoryElement<string> connectionString, DataFactoryKeyVaultSecretReference password, string encryptedCredential) : base(linkedServiceType, connectVia, description, parameters, annotations, additionalProperties)
         {
             ConnectionString = connectionString;
             Password = password;
diff --git a/src/AzureDataFactory.TestingFramework/Generated/Models/PostgreSqlSource.Serialization.cs b/src/AzureDataFactory.TestingFramework/Generated/Models/PostgreSqlSource.Serialization.cs
index 96edde17..a7bc5828 100644
--- a/src/AzureDataFactory.TestingFramework/Generated/Models/PostgreSqlSource.Serialization.cs
+++ b/src/AzureDataFactory.TestingFramework/Generated/Models/PostgreSqlSource.Serialization.cs
@@ -83,8 +83,8 @@ internal static PostgreSqlSource DeserializePostgreSqlSource(JsonElement element
             Optional<DataFactoryElement<string>> sourceRetryWait = default;
             Optional<DataFactoryElement<int>> maxConcurrentConnections = default;
             Optional<DataFactoryElement<bool>> disableMetricsCollection = default;
-            IDictionary<string, BinaryData> additionalProperties = default;
-            Dictionary<string, BinaryData> additionalPropertiesDictionary = new Dictionary<string, BinaryData>();
+            IDictionary<string, DataFactoryElement<string>> additionalProperties = default;
+            Dictionary<string, DataFactoryElement<string>> additionalPropertiesDictionary = new Dictionary<string, DataFactoryElement<string>>();
             foreach (var property in element.EnumerateObject())
             {
                 if (property.NameEquals("query"u8))
@@ -155,7 +155,7 @@ internal static PostgreSqlSource DeserializePostgreSqlSource(JsonElement element
                     disableMetricsCollection = JsonSerializer.Deserialize<DataFactoryElement<bool>>(property.Value.GetRawText());
                     continue;
                 }
-                additionalPropertiesDictionary.Add(property.Name, BinaryData.FromString(property.Value.GetRawText()));
+                additionalPropertiesDictionary.Add(property.Name, JsonSerializer.Deserialize<DataFactoryElement<string>>(property.Value.GetRawText()));
             }
             additionalProperties = additionalPropertiesDictionary;
             return new PostgreSqlSource(type, sourceRetryCount.Value, sourceRetryWait.Value, maxConcurrentConnections.Value, disableMetricsCollection.Value, additionalProperties, queryTimeout.Value, additionalColumns.Value, query.Value);
diff --git a/src/AzureDataFactory.TestingFramework/Generated/Models/PostgreSqlSource.cs b/src/AzureDataFactory.TestingFramework/Generated/Models/PostgreSqlSource.cs
index 41c44059..7cee269e 100644
--- a/src/AzureDataFactory.TestingFramework/Generated/Models/PostgreSqlSource.cs
+++ b/src/AzureDataFactory.TestingFramework/Generated/Models/PostgreSqlSource.cs
@@ -28,7 +28,7 @@ public PostgreSqlSource()
         /// <param name="queryTimeout"> Query timeout. Type: string (or Expression with resultType string), pattern: ((\d+)\.)?(\d\d):(60|([0-5][0-9])):(60|([0-5][0-9])). </param>
         /// <param name="additionalColumns"> Specifies the additional columns to be added to source data. Type: array of objects(AdditionalColumns) (or Expression with resultType array of objects). </param>
         /// <param name="query"> Database query. Type: string (or Expression with resultType string). </param>
-        internal PostgreSqlSource(string copySourceType, DataFactoryElement<int> sourceRetryCount, DataFactoryElement<string> sourceRetryWait, DataFactoryElement<int> maxConcurrentConnections, DataFactoryElement<bool> disableMetricsCollection, IDictionary<string, BinaryData> additionalProperties, DataFactoryElement<string> queryTimeout, BinaryData additionalColumns, DataFactoryElement<string> query) : base(copySourceType, sourceRetryCount, sourceRetryWait, maxConcurrentConnections, disableMetricsCollection, additionalProperties, queryTimeout, additionalColumns)
+        internal PostgreSqlSource(string copySourceType, DataFactoryElement<int> sourceRetryCount, DataFactoryElement<string> sourceRetryWait, DataFactoryElement<int> maxConcurrentConnections, DataFactoryElement<bool> disableMetricsCollection, IDictionary<string, DataFactoryElement<string>> additionalProperties, DataFactoryElement<string> queryTimeout, BinaryData additionalColumns, DataFactoryElement<string> query) : base(copySourceType, sourceRetryCount, sourceRetryWait, maxConcurrentConnections, disableMetricsCollection, additionalProperties, queryTimeout, additionalColumns)
         {
             Query = query;
             CopySourceType = copySourceType ?? "PostgreSqlSource";
diff --git a/src/AzureDataFactory.TestingFramework/Generated/Models/PostgreSqlTableDataset.Serialization.cs b/src/AzureDataFactory.TestingFramework/Generated/Models/PostgreSqlTableDataset.Serialization.cs
index 2252a094..afec851f 100644
--- a/src/AzureDataFactory.TestingFramework/Generated/Models/PostgreSqlTableDataset.Serialization.cs
+++ b/src/AzureDataFactory.TestingFramework/Generated/Models/PostgreSqlTableDataset.Serialization.cs
@@ -120,8 +120,8 @@ internal static PostgreSqlTableDataset DeserializePostgreSqlTableDataset(JsonEle
             Optional<BinaryData> tableName = default;
             Optional<DataFactoryElement<string>> table = default;
             Optional<DataFactoryElement<string>> schema0 = default;
-            IDictionary<string, BinaryData> additionalProperties = default;
-            Dictionary<string, BinaryData> additionalPropertiesDictionary = new Dictionary<string, BinaryData>();
+            IDictionary<string, DataFactoryElement<string>> additionalProperties = default;
+            Dictionary<string, DataFactoryElement<string>> additionalPropertiesDictionary = new Dictionary<string, DataFactoryElement<string>>();
             foreach (var property in element.EnumerateObject())
             {
                 if (property.NameEquals("type"u8))
@@ -240,7 +240,7 @@ internal static PostgreSqlTableDataset DeserializePostgreSqlTableDataset(JsonEle
                     }
                     continue;
                 }
-                additionalPropertiesDictionary.Add(property.Name, BinaryData.FromString(property.Value.GetRawText()));
+                additionalPropertiesDictionary.Add(property.Name, JsonSerializer.Deserialize<DataFactoryElement<string>>(property.Value.GetRawText()));
             }
             additionalProperties = additionalPropertiesDictionary;
             return new PostgreSqlTableDataset(type, description.Value, structure.Value, schema.Value, linkedServiceName, Optional.ToDictionary(parameters), Optional.ToList(annotations), folder.Value, additionalProperties, tableName.Value, table.Value, schema0.Value);
diff --git a/src/AzureDataFactory.TestingFramework/Generated/Models/PostgreSqlTableDataset.cs b/src/AzureDataFactory.TestingFramework/Generated/Models/PostgreSqlTableDataset.cs
index 40eba35f..f92a85d3 100644
--- a/src/AzureDataFactory.TestingFramework/Generated/Models/PostgreSqlTableDataset.cs
+++ b/src/AzureDataFactory.TestingFramework/Generated/Models/PostgreSqlTableDataset.cs
@@ -36,7 +36,7 @@ public PostgreSqlTableDataset(DataFactoryLinkedServiceReference linkedServiceNam
         /// <param name="tableName"> This property will be retired. Please consider using schema + table properties instead. </param>
         /// <param name="table"> The PostgreSQL table name. Type: string (or Expression with resultType string). </param>
         /// <param name="schemaTypePropertiesSchema"> The PostgreSQL schema name. Type: string (or Expression with resultType string). </param>
-        internal PostgreSqlTableDataset(string datasetType, string description, DataFactoryElement<IList<DatasetDataElement>> structure, DataFactoryElement<IList<DatasetSchemaDataElement>> schema, DataFactoryLinkedServiceReference linkedServiceName, IDictionary<string, EntityParameterSpecification> parameters, IList<BinaryData> annotations, DatasetFolder folder, IDictionary<string, BinaryData> additionalProperties, BinaryData tableName, DataFactoryElement<string> table, DataFactoryElement<string> schemaTypePropertiesSchema) : base(datasetType, description, structure, schema, linkedServiceName, parameters, annotations, folder, additionalProperties)
+        internal PostgreSqlTableDataset(string datasetType, string description, DataFactoryElement<IList<DatasetDataElement>> structure, DataFactoryElement<IList<DatasetSchemaDataElement>> schema, DataFactoryLinkedServiceReference linkedServiceName, IDictionary<string, EntityParameterSpecification> parameters, IList<BinaryData> annotations, DatasetFolder folder, IDictionary<string, DataFactoryElement<string>> additionalProperties, BinaryData tableName, DataFactoryElement<string> table, DataFactoryElement<string> schemaTypePropertiesSchema) : base(datasetType, description, structure, schema, linkedServiceName, parameters, annotations, folder, additionalProperties)
         {
             TableName = tableName;
             Table = table;
diff --git a/src/AzureDataFactory.TestingFramework/Generated/Models/PrestoLinkedService.Serialization.cs b/src/AzureDataFactory.TestingFramework/Generated/Models/PrestoLinkedService.Serialization.cs
index 82ba23fc..4bfa663b 100644
--- a/src/AzureDataFactory.TestingFramework/Generated/Models/PrestoLinkedService.Serialization.cs
+++ b/src/AzureDataFactory.TestingFramework/Generated/Models/PrestoLinkedService.Serialization.cs
@@ -156,8 +156,8 @@ internal static PrestoLinkedService DeserializePrestoLinkedService(JsonElement e
             Optional<DataFactoryElement<bool>> allowSelfSignedServerCert = default;
             Optional<DataFactoryElement<string>> timeZoneId = default;
             Optional<string> encryptedCredential = default;
-            IDictionary<string, BinaryData> additionalProperties = default;
-            Dictionary<string, BinaryData> additionalPropertiesDictionary = new Dictionary<string, BinaryData>();
+            IDictionary<string, DataFactoryElement<string>> additionalProperties = default;
+            Dictionary<string, DataFactoryElement<string>> additionalPropertiesDictionary = new Dictionary<string, DataFactoryElement<string>>();
             foreach (var property in element.EnumerateObject())
             {
                 if (property.NameEquals("type"u8))
@@ -332,7 +332,7 @@ internal static PrestoLinkedService DeserializePrestoLinkedService(JsonElement e
                     }
                     continue;
                 }
-                additionalPropertiesDictionary.Add(property.Name, BinaryData.FromString(property.Value.GetRawText()));
+                additionalPropertiesDictionary.Add(property.Name, JsonSerializer.Deserialize<DataFactoryElement<string>>(property.Value.GetRawText()));
             }
             additionalProperties = additionalPropertiesDictionary;
             return new PrestoLinkedService(type, connectVia.Value, description.Value, Optional.ToDictionary(parameters), Optional.ToList(annotations), additionalProperties, host, serverVersion, catalog, port.Value, authenticationType, username.Value, password, enableSsl.Value, trustedCertPath.Value, useSystemTrustStore.Value, allowHostNameCNMismatch.Value, allowSelfSignedServerCert.Value, timeZoneId.Value, encryptedCredential.Value);
diff --git a/src/AzureDataFactory.TestingFramework/Generated/Models/PrestoLinkedService.cs b/src/AzureDataFactory.TestingFramework/Generated/Models/PrestoLinkedService.cs
index 42587515..1799cf38 100644
--- a/src/AzureDataFactory.TestingFramework/Generated/Models/PrestoLinkedService.cs
+++ b/src/AzureDataFactory.TestingFramework/Generated/Models/PrestoLinkedService.cs
@@ -53,7 +53,7 @@ public PrestoLinkedService(DataFactoryElement<string> host, DataFactoryElement<s
         /// <param name="allowSelfSignedServerCert"> Specifies whether to allow self-signed certificates from the server. The default value is false. </param>
         /// <param name="timeZoneId"> The local time zone used by the connection. Valid values for this option are specified in the IANA Time Zone Database. The default value is the system time zone. </param>
         /// <param name="encryptedCredential"> The encrypted credential used for authentication. Credentials are encrypted using the integration runtime credential manager. Type: string. </param>
-        internal PrestoLinkedService(string linkedServiceType, IntegrationRuntimeReference connectVia, string description, IDictionary<string, EntityParameterSpecification> parameters, IList<BinaryData> annotations, IDictionary<string, BinaryData> additionalProperties, DataFactoryElement<string> host, DataFactoryElement<string> serverVersion, DataFactoryElement<string> catalog, DataFactoryElement<int> port, PrestoAuthenticationType authenticationType, DataFactoryElement<string> username, DataFactorySecretBaseDefinition password, DataFactoryElement<bool> enableSsl, DataFactoryElement<string> trustedCertPath, DataFactoryElement<bool> useSystemTrustStore, DataFactoryElement<bool> allowHostNameCNMismatch, DataFactoryElement<bool> allowSelfSignedServerCert, DataFactoryElement<string> timeZoneId, string encryptedCredential) : base(linkedServiceType, connectVia, description, parameters, annotations, additionalProperties)
+        internal PrestoLinkedService(string linkedServiceType, IntegrationRuntimeReference connectVia, string description, IDictionary<string, EntityParameterSpecification> parameters, IList<BinaryData> annotations, IDictionary<string, DataFactoryElement<string>> additionalProperties, DataFactoryElement<string> host, DataFactoryElement<string> serverVersion, DataFactoryElement<string> catalog, DataFactoryElement<int> port, PrestoAuthenticationType authenticationType, DataFactoryElement<string> username, DataFactorySecretBaseDefinition password, DataFactoryElement<bool> enableSsl, DataFactoryElement<string> trustedCertPath, DataFactoryElement<bool> useSystemTrustStore, DataFactoryElement<bool> allowHostNameCNMismatch, DataFactoryElement<bool> allowSelfSignedServerCert, DataFactoryElement<string> timeZoneId, string encryptedCredential) : base(linkedServiceType, connectVia, description, parameters, annotations, additionalProperties)
         {
             Host = host;
             ServerVersion = serverVersion;
diff --git a/src/AzureDataFactory.TestingFramework/Generated/Models/PrestoObjectDataset.Serialization.cs b/src/AzureDataFactory.TestingFramework/Generated/Models/PrestoObjectDataset.Serialization.cs
index 261016ec..9a2fed33 100644
--- a/src/AzureDataFactory.TestingFramework/Generated/Models/PrestoObjectDataset.Serialization.cs
+++ b/src/AzureDataFactory.TestingFramework/Generated/Models/PrestoObjectDataset.Serialization.cs
@@ -120,8 +120,8 @@ internal static PrestoObjectDataset DeserializePrestoObjectDataset(JsonElement e
             Optional<BinaryData> tableName = default;
             Optional<DataFactoryElement<string>> table = default;
             Optional<DataFactoryElement<string>> schema0 = default;
-            IDictionary<string, BinaryData> additionalProperties = default;
-            Dictionary<string, BinaryData> additionalPropertiesDictionary = new Dictionary<string, BinaryData>();
+            IDictionary<string, DataFactoryElement<string>> additionalProperties = default;
+            Dictionary<string, DataFactoryElement<string>> additionalPropertiesDictionary = new Dictionary<string, DataFactoryElement<string>>();
             foreach (var property in element.EnumerateObject())
             {
                 if (property.NameEquals("type"u8))
@@ -240,7 +240,7 @@ internal static PrestoObjectDataset DeserializePrestoObjectDataset(JsonElement e
                     }
                     continue;
                 }
-                additionalPropertiesDictionary.Add(property.Name, BinaryData.FromString(property.Value.GetRawText()));
+                additionalPropertiesDictionary.Add(property.Name, JsonSerializer.Deserialize<DataFactoryElement<string>>(property.Value.GetRawText()));
             }
             additionalProperties = additionalPropertiesDictionary;
             return new PrestoObjectDataset(type, description.Value, structure.Value, schema.Value, linkedServiceName, Optional.ToDictionary(parameters), Optional.ToList(annotations), folder.Value, additionalProperties, tableName.Value, table.Value, schema0.Value);
diff --git a/src/AzureDataFactory.TestingFramework/Generated/Models/PrestoObjectDataset.cs b/src/AzureDataFactory.TestingFramework/Generated/Models/PrestoObjectDataset.cs
index 1aad2679..dbf20682 100644
--- a/src/AzureDataFactory.TestingFramework/Generated/Models/PrestoObjectDataset.cs
+++ b/src/AzureDataFactory.TestingFramework/Generated/Models/PrestoObjectDataset.cs
@@ -36,7 +36,7 @@ public PrestoObjectDataset(DataFactoryLinkedServiceReference linkedServiceName)
         /// <param name="tableName"> This property will be retired. Please consider using schema + table properties instead. </param>
         /// <param name="table"> The table name of the Presto. Type: string (or Expression with resultType string). </param>
         /// <param name="schemaTypePropertiesSchema"> The schema name of the Presto. Type: string (or Expression with resultType string). </param>
-        internal PrestoObjectDataset(string datasetType, string description, DataFactoryElement<IList<DatasetDataElement>> structure, DataFactoryElement<IList<DatasetSchemaDataElement>> schema, DataFactoryLinkedServiceReference linkedServiceName, IDictionary<string, EntityParameterSpecification> parameters, IList<BinaryData> annotations, DatasetFolder folder, IDictionary<string, BinaryData> additionalProperties, BinaryData tableName, DataFactoryElement<string> table, DataFactoryElement<string> schemaTypePropertiesSchema) : base(datasetType, description, structure, schema, linkedServiceName, parameters, annotations, folder, additionalProperties)
+        internal PrestoObjectDataset(string datasetType, string description, DataFactoryElement<IList<DatasetDataElement>> structure, DataFactoryElement<IList<DatasetSchemaDataElement>> schema, DataFactoryLinkedServiceReference linkedServiceName, IDictionary<string, EntityParameterSpecification> parameters, IList<BinaryData> annotations, DatasetFolder folder, IDictionary<string, DataFactoryElement<string>> additionalProperties, BinaryData tableName, DataFactoryElement<string> table, DataFactoryElement<string> schemaTypePropertiesSchema) : base(datasetType, description, structure, schema, linkedServiceName, parameters, annotations, folder, additionalProperties)
         {
             TableName = tableName;
             Table = table;
diff --git a/src/AzureDataFactory.TestingFramework/Generated/Models/PrestoSource.Serialization.cs b/src/AzureDataFactory.TestingFramework/Generated/Models/PrestoSource.Serialization.cs
index de61d3a0..6d0edd02 100644
--- a/src/AzureDataFactory.TestingFramework/Generated/Models/PrestoSource.Serialization.cs
+++ b/src/AzureDataFactory.TestingFramework/Generated/Models/PrestoSource.Serialization.cs
@@ -83,8 +83,8 @@ internal static PrestoSource DeserializePrestoSource(JsonElement element)
             Optional<DataFactoryElement<string>> sourceRetryWait = default;
             Optional<DataFactoryElement<int>> maxConcurrentConnections = default;
             Optional<DataFactoryElement<bool>> disableMetricsCollection = default;
-            IDictionary<string, BinaryData> additionalProperties = default;
-            Dictionary<string, BinaryData> additionalPropertiesDictionary = new Dictionary<string, BinaryData>();
+            IDictionary<string, DataFactoryElement<string>> additionalProperties = default;
+            Dictionary<string, DataFactoryElement<string>> additionalPropertiesDictionary = new Dictionary<string, DataFactoryElement<string>>();
             foreach (var property in element.EnumerateObject())
             {
                 if (property.NameEquals("query"u8))
@@ -155,7 +155,7 @@ internal static PrestoSource DeserializePrestoSource(JsonElement element)
                     disableMetricsCollection = JsonSerializer.Deserialize<DataFactoryElement<bool>>(property.Value.GetRawText());
                     continue;
                 }
-                additionalPropertiesDictionary.Add(property.Name, BinaryData.FromString(property.Value.GetRawText()));
+                additionalPropertiesDictionary.Add(property.Name, JsonSerializer.Deserialize<DataFactoryElement<string>>(property.Value.GetRawText()));
             }
             additionalProperties = additionalPropertiesDictionary;
             return new PrestoSource(type, sourceRetryCount.Value, sourceRetryWait.Value, maxConcurrentConnections.Value, disableMetricsCollection.Value, additionalProperties, queryTimeout.Value, additionalColumns.Value, query.Value);
diff --git a/src/AzureDataFactory.TestingFramework/Generated/Models/PrestoSource.cs b/src/AzureDataFactory.TestingFramework/Generated/Models/PrestoSource.cs
index f1c0a2f1..04f429d5 100644
--- a/src/AzureDataFactory.TestingFramework/Generated/Models/PrestoSource.cs
+++ b/src/AzureDataFactory.TestingFramework/Generated/Models/PrestoSource.cs
@@ -28,7 +28,7 @@ public PrestoSource()
         /// <param name="queryTimeout"> Query timeout. Type: string (or Expression with resultType string), pattern: ((\d+)\.)?(\d\d):(60|([0-5][0-9])):(60|([0-5][0-9])). </param>
         /// <param name="additionalColumns"> Specifies the additional columns to be added to source data. Type: array of objects(AdditionalColumns) (or Expression with resultType array of objects). </param>
         /// <param name="query"> A query to retrieve data from source. Type: string (or Expression with resultType string). </param>
-        internal PrestoSource(string copySourceType, DataFactoryElement<int> sourceRetryCount, DataFactoryElement<string> sourceRetryWait, DataFactoryElement<int> maxConcurrentConnections, DataFactoryElement<bool> disableMetricsCollection, IDictionary<string, BinaryData> additionalProperties, DataFactoryElement<string> queryTimeout, BinaryData additionalColumns, DataFactoryElement<string> query) : base(copySourceType, sourceRetryCount, sourceRetryWait, maxConcurrentConnections, disableMetricsCollection, additionalProperties, queryTimeout, additionalColumns)
+        internal PrestoSource(string copySourceType, DataFactoryElement<int> sourceRetryCount, DataFactoryElement<string> sourceRetryWait, DataFactoryElement<int> maxConcurrentConnections, DataFactoryElement<bool> disableMetricsCollection, IDictionary<string, DataFactoryElement<string>> additionalProperties, DataFactoryElement<string> queryTimeout, BinaryData additionalColumns, DataFactoryElement<string> query) : base(copySourceType, sourceRetryCount, sourceRetryWait, maxConcurrentConnections, disableMetricsCollection, additionalProperties, queryTimeout, additionalColumns)
         {
             Query = query;
             CopySourceType = copySourceType ?? "PrestoSource";
diff --git a/src/AzureDataFactory.TestingFramework/Generated/Models/QuickBooksLinkedService.Serialization.cs b/src/AzureDataFactory.TestingFramework/Generated/Models/QuickBooksLinkedService.Serialization.cs
index 27a079e4..810579e2 100644
--- a/src/AzureDataFactory.TestingFramework/Generated/Models/QuickBooksLinkedService.Serialization.cs
+++ b/src/AzureDataFactory.TestingFramework/Generated/Models/QuickBooksLinkedService.Serialization.cs
@@ -142,8 +142,8 @@ internal static QuickBooksLinkedService DeserializeQuickBooksLinkedService(JsonE
             Optional<DataFactorySecretBaseDefinition> accessTokenSecret = default;
             Optional<DataFactoryElement<bool>> useEncryptedEndpoints = default;
             Optional<string> encryptedCredential = default;
-            IDictionary<string, BinaryData> additionalProperties = default;
-            Dictionary<string, BinaryData> additionalPropertiesDictionary = new Dictionary<string, BinaryData>();
+            IDictionary<string, DataFactoryElement<string>> additionalProperties = default;
+            Dictionary<string, DataFactoryElement<string>> additionalPropertiesDictionary = new Dictionary<string, DataFactoryElement<string>>();
             foreach (var property in element.EnumerateObject())
             {
                 if (property.NameEquals("type"u8))
@@ -289,7 +289,7 @@ internal static QuickBooksLinkedService DeserializeQuickBooksLinkedService(JsonE
                     }
                     continue;
                 }
-                additionalPropertiesDictionary.Add(property.Name, BinaryData.FromString(property.Value.GetRawText()));
+                additionalPropertiesDictionary.Add(property.Name, JsonSerializer.Deserialize<DataFactoryElement<string>>(property.Value.GetRawText()));
             }
             additionalProperties = additionalPropertiesDictionary;
             return new QuickBooksLinkedService(type, connectVia.Value, description.Value, Optional.ToDictionary(parameters), Optional.ToList(annotations), additionalProperties, connectionProperties.Value, endpoint.Value, companyId.Value, consumerKey.Value, consumerSecret, accessToken, accessTokenSecret, useEncryptedEndpoints.Value, encryptedCredential.Value);
diff --git a/src/AzureDataFactory.TestingFramework/Generated/Models/QuickBooksLinkedService.cs b/src/AzureDataFactory.TestingFramework/Generated/Models/QuickBooksLinkedService.cs
index e86ae42d..4f776dd3 100644
--- a/src/AzureDataFactory.TestingFramework/Generated/Models/QuickBooksLinkedService.cs
+++ b/src/AzureDataFactory.TestingFramework/Generated/Models/QuickBooksLinkedService.cs
@@ -34,7 +34,7 @@ public QuickBooksLinkedService()
         /// <param name="accessTokenSecret"> The access token secret for OAuth 1.0 authentication. </param>
         /// <param name="useEncryptedEndpoints"> Specifies whether the data source endpoints are encrypted using HTTPS. The default value is true. </param>
         /// <param name="encryptedCredential"> The encrypted credential used for authentication. Credentials are encrypted using the integration runtime credential manager. Type: string. </param>
-        internal QuickBooksLinkedService(string linkedServiceType, IntegrationRuntimeReference connectVia, string description, IDictionary<string, EntityParameterSpecification> parameters, IList<BinaryData> annotations, IDictionary<string, BinaryData> additionalProperties, BinaryData connectionProperties, DataFactoryElement<string> endpoint, DataFactoryElement<string> companyId, DataFactoryElement<string> consumerKey, DataFactorySecretBaseDefinition consumerSecret, DataFactorySecretBaseDefinition accessToken, DataFactorySecretBaseDefinition accessTokenSecret, DataFactoryElement<bool> useEncryptedEndpoints, string encryptedCredential) : base(linkedServiceType, connectVia, description, parameters, annotations, additionalProperties)
+        internal QuickBooksLinkedService(string linkedServiceType, IntegrationRuntimeReference connectVia, string description, IDictionary<string, EntityParameterSpecification> parameters, IList<BinaryData> annotations, IDictionary<string, DataFactoryElement<string>> additionalProperties, BinaryData connectionProperties, DataFactoryElement<string> endpoint, DataFactoryElement<string> companyId, DataFactoryElement<string> consumerKey, DataFactorySecretBaseDefinition consumerSecret, DataFactorySecretBaseDefinition accessToken, DataFactorySecretBaseDefinition accessTokenSecret, DataFactoryElement<bool> useEncryptedEndpoints, string encryptedCredential) : base(linkedServiceType, connectVia, description, parameters, annotations, additionalProperties)
         {
             ConnectionProperties = connectionProperties;
             Endpoint = endpoint;
diff --git a/src/AzureDataFactory.TestingFramework/Generated/Models/QuickBooksObjectDataset.Serialization.cs b/src/AzureDataFactory.TestingFramework/Generated/Models/QuickBooksObjectDataset.Serialization.cs
index 1ca54543..54b6a127 100644
--- a/src/AzureDataFactory.TestingFramework/Generated/Models/QuickBooksObjectDataset.Serialization.cs
+++ b/src/AzureDataFactory.TestingFramework/Generated/Models/QuickBooksObjectDataset.Serialization.cs
@@ -104,8 +104,8 @@ internal static QuickBooksObjectDataset DeserializeQuickBooksObjectDataset(JsonE
             Optional<IList<BinaryData>> annotations = default;
             Optional<DatasetFolder> folder = default;
             Optional<DataFactoryElement<string>> tableName = default;
-            IDictionary<string, BinaryData> additionalProperties = default;
-            Dictionary<string, BinaryData> additionalPropertiesDictionary = new Dictionary<string, BinaryData>();
+            IDictionary<string, DataFactoryElement<string>> additionalProperties = default;
+            Dictionary<string, DataFactoryElement<string>> additionalPropertiesDictionary = new Dictionary<string, DataFactoryElement<string>>();
             foreach (var property in element.EnumerateObject())
             {
                 if (property.NameEquals("type"u8))
@@ -206,7 +206,7 @@ internal static QuickBooksObjectDataset DeserializeQuickBooksObjectDataset(JsonE
                     }
                     continue;
                 }
-                additionalPropertiesDictionary.Add(property.Name, BinaryData.FromString(property.Value.GetRawText()));
+                additionalPropertiesDictionary.Add(property.Name, JsonSerializer.Deserialize<DataFactoryElement<string>>(property.Value.GetRawText()));
             }
             additionalProperties = additionalPropertiesDictionary;
             return new QuickBooksObjectDataset(type, description.Value, structure.Value, schema.Value, linkedServiceName, Optional.ToDictionary(parameters), Optional.ToList(annotations), folder.Value, additionalProperties, tableName.Value);
diff --git a/src/AzureDataFactory.TestingFramework/Generated/Models/QuickBooksObjectDataset.cs b/src/AzureDataFactory.TestingFramework/Generated/Models/QuickBooksObjectDataset.cs
index edbf48b0..190522fb 100644
--- a/src/AzureDataFactory.TestingFramework/Generated/Models/QuickBooksObjectDataset.cs
+++ b/src/AzureDataFactory.TestingFramework/Generated/Models/QuickBooksObjectDataset.cs
@@ -34,7 +34,7 @@ public QuickBooksObjectDataset(DataFactoryLinkedServiceReference linkedServiceNa
         /// <param name="folder"> The folder that this Dataset is in. If not specified, Dataset will appear at the root level. </param>
         /// <param name="additionalProperties"> Additional Properties. </param>
         /// <param name="tableName"> The table name. Type: string (or Expression with resultType string). </param>
-        internal QuickBooksObjectDataset(string datasetType, string description, DataFactoryElement<IList<DatasetDataElement>> structure, DataFactoryElement<IList<DatasetSchemaDataElement>> schema, DataFactoryLinkedServiceReference linkedServiceName, IDictionary<string, EntityParameterSpecification> parameters, IList<BinaryData> annotations, DatasetFolder folder, IDictionary<string, BinaryData> additionalProperties, DataFactoryElement<string> tableName) : base(datasetType, description, structure, schema, linkedServiceName, parameters, annotations, folder, additionalProperties)
+        internal QuickBooksObjectDataset(string datasetType, string description, DataFactoryElement<IList<DatasetDataElement>> structure, DataFactoryElement<IList<DatasetSchemaDataElement>> schema, DataFactoryLinkedServiceReference linkedServiceName, IDictionary<string, EntityParameterSpecification> parameters, IList<BinaryData> annotations, DatasetFolder folder, IDictionary<string, DataFactoryElement<string>> additionalProperties, DataFactoryElement<string> tableName) : base(datasetType, description, structure, schema, linkedServiceName, parameters, annotations, folder, additionalProperties)
         {
             TableName = tableName;
             DatasetType = datasetType ?? "QuickBooksObject";
diff --git a/src/AzureDataFactory.TestingFramework/Generated/Models/QuickBooksSource.Serialization.cs b/src/AzureDataFactory.TestingFramework/Generated/Models/QuickBooksSource.Serialization.cs
index 1235a4c7..0f42e905 100644
--- a/src/AzureDataFactory.TestingFramework/Generated/Models/QuickBooksSource.Serialization.cs
+++ b/src/AzureDataFactory.TestingFramework/Generated/Models/QuickBooksSource.Serialization.cs
@@ -83,8 +83,8 @@ internal static QuickBooksSource DeserializeQuickBooksSource(JsonElement element
             Optional<DataFactoryElement<string>> sourceRetryWait = default;
             Optional<DataFactoryElement<int>> maxConcurrentConnections = default;
             Optional<DataFactoryElement<bool>> disableMetricsCollection = default;
-            IDictionary<string, BinaryData> additionalProperties = default;
-            Dictionary<string, BinaryData> additionalPropertiesDictionary = new Dictionary<string, BinaryData>();
+            IDictionary<string, DataFactoryElement<string>> additionalProperties = default;
+            Dictionary<string, DataFactoryElement<string>> additionalPropertiesDictionary = new Dictionary<string, DataFactoryElement<string>>();
             foreach (var property in element.EnumerateObject())
             {
                 if (property.NameEquals("query"u8))
@@ -155,7 +155,7 @@ internal static QuickBooksSource DeserializeQuickBooksSource(JsonElement element
                     disableMetricsCollection = JsonSerializer.Deserialize<DataFactoryElement<bool>>(property.Value.GetRawText());
                     continue;
                 }
-                additionalPropertiesDictionary.Add(property.Name, BinaryData.FromString(property.Value.GetRawText()));
+                additionalPropertiesDictionary.Add(property.Name, JsonSerializer.Deserialize<DataFactoryElement<string>>(property.Value.GetRawText()));
             }
             additionalProperties = additionalPropertiesDictionary;
             return new QuickBooksSource(type, sourceRetryCount.Value, sourceRetryWait.Value, maxConcurrentConnections.Value, disableMetricsCollection.Value, additionalProperties, queryTimeout.Value, additionalColumns.Value, query.Value);
diff --git a/src/AzureDataFactory.TestingFramework/Generated/Models/QuickBooksSource.cs b/src/AzureDataFactory.TestingFramework/Generated/Models/QuickBooksSource.cs
index 5c6b0860..fd20bc00 100644
--- a/src/AzureDataFactory.TestingFramework/Generated/Models/QuickBooksSource.cs
+++ b/src/AzureDataFactory.TestingFramework/Generated/Models/QuickBooksSource.cs
@@ -28,7 +28,7 @@ public QuickBooksSource()
         /// <param name="queryTimeout"> Query timeout. Type: string (or Expression with resultType string), pattern: ((\d+)\.)?(\d\d):(60|([0-5][0-9])):(60|([0-5][0-9])). </param>
         /// <param name="additionalColumns"> Specifies the additional columns to be added to source data. Type: array of objects(AdditionalColumns) (or Expression with resultType array of objects). </param>
         /// <param name="query"> A query to retrieve data from source. Type: string (or Expression with resultType string). </param>
-        internal QuickBooksSource(string copySourceType, DataFactoryElement<int> sourceRetryCount, DataFactoryElement<string> sourceRetryWait, DataFactoryElement<int> maxConcurrentConnections, DataFactoryElement<bool> disableMetricsCollection, IDictionary<string, BinaryData> additionalProperties, DataFactoryElement<string> queryTimeout, BinaryData additionalColumns, DataFactoryElement<string> query) : base(copySourceType, sourceRetryCount, sourceRetryWait, maxConcurrentConnections, disableMetricsCollection, additionalProperties, queryTimeout, additionalColumns)
+        internal QuickBooksSource(string copySourceType, DataFactoryElement<int> sourceRetryCount, DataFactoryElement<string> sourceRetryWait, DataFactoryElement<int> maxConcurrentConnections, DataFactoryElement<bool> disableMetricsCollection, IDictionary<string, DataFactoryElement<string>> additionalProperties, DataFactoryElement<string> queryTimeout, BinaryData additionalColumns, DataFactoryElement<string> query) : base(copySourceType, sourceRetryCount, sourceRetryWait, maxConcurrentConnections, disableMetricsCollection, additionalProperties, queryTimeout, additionalColumns)
         {
             Query = query;
             CopySourceType = copySourceType ?? "QuickBooksSource";
diff --git a/src/AzureDataFactory.TestingFramework/Generated/Models/QuickbaseLinkedService.Serialization.cs b/src/AzureDataFactory.TestingFramework/Generated/Models/QuickbaseLinkedService.Serialization.cs
index 4adbe626..220cd36e 100644
--- a/src/AzureDataFactory.TestingFramework/Generated/Models/QuickbaseLinkedService.Serialization.cs
+++ b/src/AzureDataFactory.TestingFramework/Generated/Models/QuickbaseLinkedService.Serialization.cs
@@ -95,8 +95,8 @@ internal static QuickbaseLinkedService DeserializeQuickbaseLinkedService(JsonEle
             DataFactoryElement<string> url = default;
             DataFactorySecretBaseDefinition userToken = default;
             Optional<string> encryptedCredential = default;
-            IDictionary<string, BinaryData> additionalProperties = default;
-            Dictionary<string, BinaryData> additionalPropertiesDictionary = new Dictionary<string, BinaryData>();
+            IDictionary<string, DataFactoryElement<string>> additionalProperties = default;
+            Dictionary<string, DataFactoryElement<string>> additionalPropertiesDictionary = new Dictionary<string, DataFactoryElement<string>>();
             foreach (var property in element.EnumerateObject())
             {
                 if (property.NameEquals("type"u8))
@@ -180,7 +180,7 @@ internal static QuickbaseLinkedService DeserializeQuickbaseLinkedService(JsonEle
                     }
                     continue;
                 }
-                additionalPropertiesDictionary.Add(property.Name, BinaryData.FromString(property.Value.GetRawText()));
+                additionalPropertiesDictionary.Add(property.Name, JsonSerializer.Deserialize<DataFactoryElement<string>>(property.Value.GetRawText()));
             }
             additionalProperties = additionalPropertiesDictionary;
             return new QuickbaseLinkedService(type, connectVia.Value, description.Value, Optional.ToDictionary(parameters), Optional.ToList(annotations), additionalProperties, url, userToken, encryptedCredential.Value);
diff --git a/src/AzureDataFactory.TestingFramework/Generated/Models/QuickbaseLinkedService.cs b/src/AzureDataFactory.TestingFramework/Generated/Models/QuickbaseLinkedService.cs
index 68e0a539..d949f915 100644
--- a/src/AzureDataFactory.TestingFramework/Generated/Models/QuickbaseLinkedService.cs
+++ b/src/AzureDataFactory.TestingFramework/Generated/Models/QuickbaseLinkedService.cs
@@ -37,7 +37,7 @@ public QuickbaseLinkedService(DataFactoryElement<string> uri, DataFactorySecretB
         /// <param name="uri"> The url to connect Quickbase source. Type: string (or Expression with resultType string). </param>
         /// <param name="userToken"> The user token for the Quickbase source. </param>
         /// <param name="encryptedCredential"> The encrypted credential used for authentication. Credentials are encrypted using the integration runtime credential manager. Type: string. </param>
-        internal QuickbaseLinkedService(string linkedServiceType, IntegrationRuntimeReference connectVia, string description, IDictionary<string, EntityParameterSpecification> parameters, IList<BinaryData> annotations, IDictionary<string, BinaryData> additionalProperties, DataFactoryElement<string> uri, DataFactorySecretBaseDefinition userToken, string encryptedCredential) : base(linkedServiceType, connectVia, description, parameters, annotations, additionalProperties)
+        internal QuickbaseLinkedService(string linkedServiceType, IntegrationRuntimeReference connectVia, string description, IDictionary<string, EntityParameterSpecification> parameters, IList<BinaryData> annotations, IDictionary<string, DataFactoryElement<string>> additionalProperties, DataFactoryElement<string> uri, DataFactorySecretBaseDefinition userToken, string encryptedCredential) : base(linkedServiceType, connectVia, description, parameters, annotations, additionalProperties)
         {
             Uri = uri;
             UserToken = userToken;
diff --git a/src/AzureDataFactory.TestingFramework/Generated/Models/RedirectIncompatibleRowSettings.Serialization.cs b/src/AzureDataFactory.TestingFramework/Generated/Models/RedirectIncompatibleRowSettings.Serialization.cs
index 986e063a..2c815740 100644
--- a/src/AzureDataFactory.TestingFramework/Generated/Models/RedirectIncompatibleRowSettings.Serialization.cs
+++ b/src/AzureDataFactory.TestingFramework/Generated/Models/RedirectIncompatibleRowSettings.Serialization.cs
@@ -43,8 +43,8 @@ internal static RedirectIncompatibleRowSettings DeserializeRedirectIncompatibleR
             }
             DataFactoryElement<string> linkedServiceName = default;
             Optional<DataFactoryElement<string>> path = default;
-            IDictionary<string, BinaryData> additionalProperties = default;
-            Dictionary<string, BinaryData> additionalPropertiesDictionary = new Dictionary<string, BinaryData>();
+            IDictionary<string, DataFactoryElement<string>> additionalProperties = default;
+            Dictionary<string, DataFactoryElement<string>> additionalPropertiesDictionary = new Dictionary<string, DataFactoryElement<string>>();
             foreach (var property in element.EnumerateObject())
             {
                 if (property.NameEquals("linkedServiceName"u8))
@@ -61,7 +61,7 @@ internal static RedirectIncompatibleRowSettings DeserializeRedirectIncompatibleR
                     path = JsonSerializer.Deserialize<DataFactoryElement<string>>(property.Value.GetRawText());
                     continue;
                 }
-                additionalPropertiesDictionary.Add(property.Name, BinaryData.FromString(property.Value.GetRawText()));
+                additionalPropertiesDictionary.Add(property.Name, JsonSerializer.Deserialize<DataFactoryElement<string>>(property.Value.GetRawText()));
             }
             additionalProperties = additionalPropertiesDictionary;
             return new RedirectIncompatibleRowSettings(linkedServiceName, path.Value, additionalProperties);
diff --git a/src/AzureDataFactory.TestingFramework/Generated/Models/RedirectIncompatibleRowSettings.cs b/src/AzureDataFactory.TestingFramework/Generated/Models/RedirectIncompatibleRowSettings.cs
index 245872a7..f6c6b3ea 100644
--- a/src/AzureDataFactory.TestingFramework/Generated/Models/RedirectIncompatibleRowSettings.cs
+++ b/src/AzureDataFactory.TestingFramework/Generated/Models/RedirectIncompatibleRowSettings.cs
@@ -21,14 +21,14 @@ public RedirectIncompatibleRowSettings(DataFactoryElement<string> linkedServiceN
             Argument.AssertNotNull(linkedServiceName, nameof(linkedServiceName));
 
             LinkedServiceName = linkedServiceName;
-            AdditionalProperties = new ChangeTrackingDictionary<string, BinaryData>();
+            AdditionalProperties = new ChangeTrackingDictionary<string, DataFactoryElement<string>>();
         }
 
         /// <summary> Initializes a new instance of RedirectIncompatibleRowSettings. </summary>
         /// <param name="linkedServiceName"> Name of the Azure Storage, Storage SAS, or Azure Data Lake Store linked service used for redirecting incompatible row. Must be specified if redirectIncompatibleRowSettings is specified. Type: string (or Expression with resultType string). </param>
         /// <param name="path"> The path for storing the redirect incompatible row data. Type: string (or Expression with resultType string). </param>
         /// <param name="additionalProperties"> Additional Properties. </param>
-        internal RedirectIncompatibleRowSettings(DataFactoryElement<string> linkedServiceName, DataFactoryElement<string> path, IDictionary<string, BinaryData> additionalProperties)
+        internal RedirectIncompatibleRowSettings(DataFactoryElement<string> linkedServiceName, DataFactoryElement<string> path, IDictionary<string, DataFactoryElement<string>> additionalProperties)
         {
             LinkedServiceName = linkedServiceName;
             Path = path;
@@ -69,6 +69,6 @@ internal RedirectIncompatibleRowSettings(DataFactoryElement<string> linkedServic
         /// </list>
         /// </para>
         /// </summary>
-        public IDictionary<string, BinaryData> AdditionalProperties { get; }
+        public IDictionary<string, DataFactoryElement<string>> AdditionalProperties { get; }
     }
 }
diff --git a/src/AzureDataFactory.TestingFramework/Generated/Models/RelationalSource.Serialization.cs b/src/AzureDataFactory.TestingFramework/Generated/Models/RelationalSource.Serialization.cs
index f347cfbc..f9b9c464 100644
--- a/src/AzureDataFactory.TestingFramework/Generated/Models/RelationalSource.Serialization.cs
+++ b/src/AzureDataFactory.TestingFramework/Generated/Models/RelationalSource.Serialization.cs
@@ -77,8 +77,8 @@ internal static RelationalSource DeserializeRelationalSource(JsonElement element
             Optional<DataFactoryElement<string>> sourceRetryWait = default;
             Optional<DataFactoryElement<int>> maxConcurrentConnections = default;
             Optional<DataFactoryElement<bool>> disableMetricsCollection = default;
-            IDictionary<string, BinaryData> additionalProperties = default;
-            Dictionary<string, BinaryData> additionalPropertiesDictionary = new Dictionary<string, BinaryData>();
+            IDictionary<string, DataFactoryElement<string>> additionalProperties = default;
+            Dictionary<string, DataFactoryElement<string>> additionalPropertiesDictionary = new Dictionary<string, DataFactoryElement<string>>();
             foreach (var property in element.EnumerateObject())
             {
                 if (property.NameEquals("query"u8))
@@ -140,7 +140,7 @@ internal static RelationalSource DeserializeRelationalSource(JsonElement element
                     disableMetricsCollection = JsonSerializer.Deserialize<DataFactoryElement<bool>>(property.Value.GetRawText());
                     continue;
                 }
-                additionalPropertiesDictionary.Add(property.Name, BinaryData.FromString(property.Value.GetRawText()));
+                additionalPropertiesDictionary.Add(property.Name, JsonSerializer.Deserialize<DataFactoryElement<string>>(property.Value.GetRawText()));
             }
             additionalProperties = additionalPropertiesDictionary;
             return new RelationalSource(type, sourceRetryCount.Value, sourceRetryWait.Value, maxConcurrentConnections.Value, disableMetricsCollection.Value, additionalProperties, query.Value, additionalColumns.Value);
diff --git a/src/AzureDataFactory.TestingFramework/Generated/Models/RelationalSource.cs b/src/AzureDataFactory.TestingFramework/Generated/Models/RelationalSource.cs
index 370d8bed..deffcc93 100644
--- a/src/AzureDataFactory.TestingFramework/Generated/Models/RelationalSource.cs
+++ b/src/AzureDataFactory.TestingFramework/Generated/Models/RelationalSource.cs
@@ -27,7 +27,7 @@ public RelationalSource()
         /// <param name="additionalProperties"> Additional Properties. </param>
         /// <param name="query"> Database query. Type: string (or Expression with resultType string). </param>
         /// <param name="additionalColumns"> Specifies the additional columns to be added to source data. Type: array of objects(AdditionalColumns) (or Expression with resultType array of objects). </param>
-        internal RelationalSource(string copySourceType, DataFactoryElement<int> sourceRetryCount, DataFactoryElement<string> sourceRetryWait, DataFactoryElement<int> maxConcurrentConnections, DataFactoryElement<bool> disableMetricsCollection, IDictionary<string, BinaryData> additionalProperties, DataFactoryElement<string> query, BinaryData additionalColumns) : base(copySourceType, sourceRetryCount, sourceRetryWait, maxConcurrentConnections, disableMetricsCollection, additionalProperties)
+        internal RelationalSource(string copySourceType, DataFactoryElement<int> sourceRetryCount, DataFactoryElement<string> sourceRetryWait, DataFactoryElement<int> maxConcurrentConnections, DataFactoryElement<bool> disableMetricsCollection, IDictionary<string, DataFactoryElement<string>> additionalProperties, DataFactoryElement<string> query, BinaryData additionalColumns) : base(copySourceType, sourceRetryCount, sourceRetryWait, maxConcurrentConnections, disableMetricsCollection, additionalProperties)
         {
             Query = query;
             AdditionalColumns = additionalColumns;
diff --git a/src/AzureDataFactory.TestingFramework/Generated/Models/RelationalTableDataset.Serialization.cs b/src/AzureDataFactory.TestingFramework/Generated/Models/RelationalTableDataset.Serialization.cs
index b5379ff3..c4ae4ba6 100644
--- a/src/AzureDataFactory.TestingFramework/Generated/Models/RelationalTableDataset.Serialization.cs
+++ b/src/AzureDataFactory.TestingFramework/Generated/Models/RelationalTableDataset.Serialization.cs
@@ -104,8 +104,8 @@ internal static RelationalTableDataset DeserializeRelationalTableDataset(JsonEle
             Optional<IList<BinaryData>> annotations = default;
             Optional<DatasetFolder> folder = default;
             Optional<DataFactoryElement<string>> tableName = default;
-            IDictionary<string, BinaryData> additionalProperties = default;
-            Dictionary<string, BinaryData> additionalPropertiesDictionary = new Dictionary<string, BinaryData>();
+            IDictionary<string, DataFactoryElement<string>> additionalProperties = default;
+            Dictionary<string, DataFactoryElement<string>> additionalPropertiesDictionary = new Dictionary<string, DataFactoryElement<string>>();
             foreach (var property in element.EnumerateObject())
             {
                 if (property.NameEquals("type"u8))
@@ -206,7 +206,7 @@ internal static RelationalTableDataset DeserializeRelationalTableDataset(JsonEle
                     }
                     continue;
                 }
-                additionalPropertiesDictionary.Add(property.Name, BinaryData.FromString(property.Value.GetRawText()));
+                additionalPropertiesDictionary.Add(property.Name, JsonSerializer.Deserialize<DataFactoryElement<string>>(property.Value.GetRawText()));
             }
             additionalProperties = additionalPropertiesDictionary;
             return new RelationalTableDataset(type, description.Value, structure.Value, schema.Value, linkedServiceName, Optional.ToDictionary(parameters), Optional.ToList(annotations), folder.Value, additionalProperties, tableName.Value);
diff --git a/src/AzureDataFactory.TestingFramework/Generated/Models/RelationalTableDataset.cs b/src/AzureDataFactory.TestingFramework/Generated/Models/RelationalTableDataset.cs
index 60a36ec0..c764afe9 100644
--- a/src/AzureDataFactory.TestingFramework/Generated/Models/RelationalTableDataset.cs
+++ b/src/AzureDataFactory.TestingFramework/Generated/Models/RelationalTableDataset.cs
@@ -34,7 +34,7 @@ public RelationalTableDataset(DataFactoryLinkedServiceReference linkedServiceNam
         /// <param name="folder"> The folder that this Dataset is in. If not specified, Dataset will appear at the root level. </param>
         /// <param name="additionalProperties"> Additional Properties. </param>
         /// <param name="tableName"> The relational table name. Type: string (or Expression with resultType string). </param>
-        internal RelationalTableDataset(string datasetType, string description, DataFactoryElement<IList<DatasetDataElement>> structure, DataFactoryElement<IList<DatasetSchemaDataElement>> schema, DataFactoryLinkedServiceReference linkedServiceName, IDictionary<string, EntityParameterSpecification> parameters, IList<BinaryData> annotations, DatasetFolder folder, IDictionary<string, BinaryData> additionalProperties, DataFactoryElement<string> tableName) : base(datasetType, description, structure, schema, linkedServiceName, parameters, annotations, folder, additionalProperties)
+        internal RelationalTableDataset(string datasetType, string description, DataFactoryElement<IList<DatasetDataElement>> structure, DataFactoryElement<IList<DatasetSchemaDataElement>> schema, DataFactoryLinkedServiceReference linkedServiceName, IDictionary<string, EntityParameterSpecification> parameters, IList<BinaryData> annotations, DatasetFolder folder, IDictionary<string, DataFactoryElement<string>> additionalProperties, DataFactoryElement<string> tableName) : base(datasetType, description, structure, schema, linkedServiceName, parameters, annotations, folder, additionalProperties)
         {
             TableName = tableName;
             DatasetType = datasetType ?? "RelationalTable";
diff --git a/src/AzureDataFactory.TestingFramework/Generated/Models/RerunTumblingWindowTrigger.Serialization.cs b/src/AzureDataFactory.TestingFramework/Generated/Models/RerunTumblingWindowTrigger.Serialization.cs
index f3a2171f..fb8dd9b0 100644
--- a/src/AzureDataFactory.TestingFramework/Generated/Models/RerunTumblingWindowTrigger.Serialization.cs
+++ b/src/AzureDataFactory.TestingFramework/Generated/Models/RerunTumblingWindowTrigger.Serialization.cs
@@ -7,6 +7,7 @@
 
 using System.Text.Json;
 using Azure.Core;
+using Azure.Core.Expressions.DataFactory;
 
 namespace AzureDataFactory.TestingFramework.Models
 {
@@ -82,8 +83,8 @@ internal static RerunTumblingWindowTrigger DeserializeRerunTumblingWindowTrigger
             DateTimeOffset requestedStartTime = default;
             DateTimeOffset requestedEndTime = default;
             int rerunConcurrency = default;
-            IDictionary<string, BinaryData> additionalProperties = default;
-            Dictionary<string, BinaryData> additionalPropertiesDictionary = new Dictionary<string, BinaryData>();
+            IDictionary<string, DataFactoryElement<string>> additionalProperties = default;
+            Dictionary<string, DataFactoryElement<string>> additionalPropertiesDictionary = new Dictionary<string, DataFactoryElement<string>>();
             foreach (var property in element.EnumerateObject())
             {
                 if (property.NameEquals("type"u8))
@@ -158,7 +159,7 @@ internal static RerunTumblingWindowTrigger DeserializeRerunTumblingWindowTrigger
                     }
                     continue;
                 }
-                additionalPropertiesDictionary.Add(property.Name, BinaryData.FromString(property.Value.GetRawText()));
+                additionalPropertiesDictionary.Add(property.Name, JsonSerializer.Deserialize<DataFactoryElement<string>>(property.Value.GetRawText()));
             }
             additionalProperties = additionalPropertiesDictionary;
             return new RerunTumblingWindowTrigger(type, description.Value, Optional.ToNullable(runtimeState), Optional.ToList(annotations), additionalProperties, parentTrigger, requestedStartTime, requestedEndTime, rerunConcurrency);
diff --git a/src/AzureDataFactory.TestingFramework/Generated/Models/RerunTumblingWindowTrigger.cs b/src/AzureDataFactory.TestingFramework/Generated/Models/RerunTumblingWindowTrigger.cs
index 91156af2..c6c9edb8 100644
--- a/src/AzureDataFactory.TestingFramework/Generated/Models/RerunTumblingWindowTrigger.cs
+++ b/src/AzureDataFactory.TestingFramework/Generated/Models/RerunTumblingWindowTrigger.cs
@@ -6,6 +6,7 @@
 #nullable disable
 
 using Azure.Core;
+using Azure.Core.Expressions.DataFactory;
 
 namespace AzureDataFactory.TestingFramework.Models
 {
@@ -39,7 +40,7 @@ public RerunTumblingWindowTrigger(BinaryData parentTrigger, DateTimeOffset reque
         /// <param name="requestedStartOn"> The start time for the time period for which restatement is initiated. Only UTC time is currently supported. </param>
         /// <param name="requestedEndOn"> The end time for the time period for which restatement is initiated. Only UTC time is currently supported. </param>
         /// <param name="rerunConcurrency"> The max number of parallel time windows (ready for execution) for which a rerun is triggered. </param>
-        internal RerunTumblingWindowTrigger(string triggerType, string description, DataFactoryTriggerRuntimeState? runtimeState, IList<BinaryData> annotations, IDictionary<string, BinaryData> additionalProperties, BinaryData parentTrigger, DateTimeOffset requestedStartOn, DateTimeOffset requestedEndOn, int rerunConcurrency) : base(triggerType, description, runtimeState, annotations, additionalProperties)
+        internal RerunTumblingWindowTrigger(string triggerType, string description, DataFactoryTriggerRuntimeState? runtimeState, IList<BinaryData> annotations, IDictionary<string, DataFactoryElement<string>> additionalProperties, BinaryData parentTrigger, DateTimeOffset requestedStartOn, DateTimeOffset requestedEndOn, int rerunConcurrency) : base(triggerType, description, runtimeState, annotations, additionalProperties)
         {
             ParentTrigger = parentTrigger;
             RequestedStartOn = requestedStartOn;
diff --git a/src/AzureDataFactory.TestingFramework/Generated/Models/ResponsysLinkedService.Serialization.cs b/src/AzureDataFactory.TestingFramework/Generated/Models/ResponsysLinkedService.Serialization.cs
index 9eea54be..932e9afe 100644
--- a/src/AzureDataFactory.TestingFramework/Generated/Models/ResponsysLinkedService.Serialization.cs
+++ b/src/AzureDataFactory.TestingFramework/Generated/Models/ResponsysLinkedService.Serialization.cs
@@ -124,8 +124,8 @@ internal static ResponsysLinkedService DeserializeResponsysLinkedService(JsonEle
             Optional<DataFactoryElement<bool>> useHostVerification = default;
             Optional<DataFactoryElement<bool>> usePeerVerification = default;
             Optional<string> encryptedCredential = default;
-            IDictionary<string, BinaryData> additionalProperties = default;
-            Dictionary<string, BinaryData> additionalPropertiesDictionary = new Dictionary<string, BinaryData>();
+            IDictionary<string, DataFactoryElement<string>> additionalProperties = default;
+            Dictionary<string, DataFactoryElement<string>> additionalPropertiesDictionary = new Dictionary<string, DataFactoryElement<string>>();
             foreach (var property in element.EnumerateObject())
             {
                 if (property.NameEquals("type"u8))
@@ -245,7 +245,7 @@ internal static ResponsysLinkedService DeserializeResponsysLinkedService(JsonEle
                     }
                     continue;
                 }
-                additionalPropertiesDictionary.Add(property.Name, BinaryData.FromString(property.Value.GetRawText()));
+                additionalPropertiesDictionary.Add(property.Name, JsonSerializer.Deserialize<DataFactoryElement<string>>(property.Value.GetRawText()));
             }
             additionalProperties = additionalPropertiesDictionary;
             return new ResponsysLinkedService(type, connectVia.Value, description.Value, Optional.ToDictionary(parameters), Optional.ToList(annotations), additionalProperties, endpoint, clientId, clientSecret, useEncryptedEndpoints.Value, useHostVerification.Value, usePeerVerification.Value, encryptedCredential.Value);
diff --git a/src/AzureDataFactory.TestingFramework/Generated/Models/ResponsysLinkedService.cs b/src/AzureDataFactory.TestingFramework/Generated/Models/ResponsysLinkedService.cs
index cb1ecfb1..a150ea39 100644
--- a/src/AzureDataFactory.TestingFramework/Generated/Models/ResponsysLinkedService.cs
+++ b/src/AzureDataFactory.TestingFramework/Generated/Models/ResponsysLinkedService.cs
@@ -41,7 +41,7 @@ public ResponsysLinkedService(BinaryData endpoint, DataFactoryElement<string> cl
         /// <param name="useHostVerification"> Specifies whether to require the host name in the server's certificate to match the host name of the server when connecting over SSL. The default value is true. Type: boolean (or Expression with resultType boolean). </param>
         /// <param name="usePeerVerification"> Specifies whether to verify the identity of the server when connecting over SSL. The default value is true. Type: boolean (or Expression with resultType boolean). </param>
         /// <param name="encryptedCredential"> The encrypted credential used for authentication. Credentials are encrypted using the integration runtime credential manager. Type: string. </param>
-        internal ResponsysLinkedService(string linkedServiceType, IntegrationRuntimeReference connectVia, string description, IDictionary<string, EntityParameterSpecification> parameters, IList<BinaryData> annotations, IDictionary<string, BinaryData> additionalProperties, BinaryData endpoint, DataFactoryElement<string> clientId, DataFactorySecretBaseDefinition clientSecret, DataFactoryElement<bool> useEncryptedEndpoints, DataFactoryElement<bool> useHostVerification, DataFactoryElement<bool> usePeerVerification, string encryptedCredential) : base(linkedServiceType, connectVia, description, parameters, annotations, additionalProperties)
+        internal ResponsysLinkedService(string linkedServiceType, IntegrationRuntimeReference connectVia, string description, IDictionary<string, EntityParameterSpecification> parameters, IList<BinaryData> annotations, IDictionary<string, DataFactoryElement<string>> additionalProperties, BinaryData endpoint, DataFactoryElement<string> clientId, DataFactorySecretBaseDefinition clientSecret, DataFactoryElement<bool> useEncryptedEndpoints, DataFactoryElement<bool> useHostVerification, DataFactoryElement<bool> usePeerVerification, string encryptedCredential) : base(linkedServiceType, connectVia, description, parameters, annotations, additionalProperties)
         {
             Endpoint = endpoint;
             ClientId = clientId;
diff --git a/src/AzureDataFactory.TestingFramework/Generated/Models/ResponsysObjectDataset.Serialization.cs b/src/AzureDataFactory.TestingFramework/Generated/Models/ResponsysObjectDataset.Serialization.cs
index 3dbf6df6..254dfdf3 100644
--- a/src/AzureDataFactory.TestingFramework/Generated/Models/ResponsysObjectDataset.Serialization.cs
+++ b/src/AzureDataFactory.TestingFramework/Generated/Models/ResponsysObjectDataset.Serialization.cs
@@ -104,8 +104,8 @@ internal static ResponsysObjectDataset DeserializeResponsysObjectDataset(JsonEle
             Optional<IList<BinaryData>> annotations = default;
             Optional<DatasetFolder> folder = default;
             Optional<DataFactoryElement<string>> tableName = default;
-            IDictionary<string, BinaryData> additionalProperties = default;
-            Dictionary<string, BinaryData> additionalPropertiesDictionary = new Dictionary<string, BinaryData>();
+            IDictionary<string, DataFactoryElement<string>> additionalProperties = default;
+            Dictionary<string, DataFactoryElement<string>> additionalPropertiesDictionary = new Dictionary<string, DataFactoryElement<string>>();
             foreach (var property in element.EnumerateObject())
             {
                 if (property.NameEquals("type"u8))
@@ -206,7 +206,7 @@ internal static ResponsysObjectDataset DeserializeResponsysObjectDataset(JsonEle
                     }
                     continue;
                 }
-                additionalPropertiesDictionary.Add(property.Name, BinaryData.FromString(property.Value.GetRawText()));
+                additionalPropertiesDictionary.Add(property.Name, JsonSerializer.Deserialize<DataFactoryElement<string>>(property.Value.GetRawText()));
             }
             additionalProperties = additionalPropertiesDictionary;
             return new ResponsysObjectDataset(type, description.Value, structure.Value, schema.Value, linkedServiceName, Optional.ToDictionary(parameters), Optional.ToList(annotations), folder.Value, additionalProperties, tableName.Value);
diff --git a/src/AzureDataFactory.TestingFramework/Generated/Models/ResponsysObjectDataset.cs b/src/AzureDataFactory.TestingFramework/Generated/Models/ResponsysObjectDataset.cs
index 1b74c0d9..f9541d34 100644
--- a/src/AzureDataFactory.TestingFramework/Generated/Models/ResponsysObjectDataset.cs
+++ b/src/AzureDataFactory.TestingFramework/Generated/Models/ResponsysObjectDataset.cs
@@ -34,7 +34,7 @@ public ResponsysObjectDataset(DataFactoryLinkedServiceReference linkedServiceNam
         /// <param name="folder"> The folder that this Dataset is in. If not specified, Dataset will appear at the root level. </param>
         /// <param name="additionalProperties"> Additional Properties. </param>
         /// <param name="tableName"> The table name. Type: string (or Expression with resultType string). </param>
-        internal ResponsysObjectDataset(string datasetType, string description, DataFactoryElement<IList<DatasetDataElement>> structure, DataFactoryElement<IList<DatasetSchemaDataElement>> schema, DataFactoryLinkedServiceReference linkedServiceName, IDictionary<string, EntityParameterSpecification> parameters, IList<BinaryData> annotations, DatasetFolder folder, IDictionary<string, BinaryData> additionalProperties, DataFactoryElement<string> tableName) : base(datasetType, description, structure, schema, linkedServiceName, parameters, annotations, folder, additionalProperties)
+        internal ResponsysObjectDataset(string datasetType, string description, DataFactoryElement<IList<DatasetDataElement>> structure, DataFactoryElement<IList<DatasetSchemaDataElement>> schema, DataFactoryLinkedServiceReference linkedServiceName, IDictionary<string, EntityParameterSpecification> parameters, IList<BinaryData> annotations, DatasetFolder folder, IDictionary<string, DataFactoryElement<string>> additionalProperties, DataFactoryElement<string> tableName) : base(datasetType, description, structure, schema, linkedServiceName, parameters, annotations, folder, additionalProperties)
         {
             TableName = tableName;
             DatasetType = datasetType ?? "ResponsysObject";
diff --git a/src/AzureDataFactory.TestingFramework/Generated/Models/ResponsysSource.Serialization.cs b/src/AzureDataFactory.TestingFramework/Generated/Models/ResponsysSource.Serialization.cs
index dd3036e8..6105adc4 100644
--- a/src/AzureDataFactory.TestingFramework/Generated/Models/ResponsysSource.Serialization.cs
+++ b/src/AzureDataFactory.TestingFramework/Generated/Models/ResponsysSource.Serialization.cs
@@ -83,8 +83,8 @@ internal static ResponsysSource DeserializeResponsysSource(JsonElement element)
             Optional<DataFactoryElement<string>> sourceRetryWait = default;
             Optional<DataFactoryElement<int>> maxConcurrentConnections = default;
             Optional<DataFactoryElement<bool>> disableMetricsCollection = default;
-            IDictionary<string, BinaryData> additionalProperties = default;
-            Dictionary<string, BinaryData> additionalPropertiesDictionary = new Dictionary<string, BinaryData>();
+            IDictionary<string, DataFactoryElement<string>> additionalProperties = default;
+            Dictionary<string, DataFactoryElement<string>> additionalPropertiesDictionary = new Dictionary<string, DataFactoryElement<string>>();
             foreach (var property in element.EnumerateObject())
             {
                 if (property.NameEquals("query"u8))
@@ -155,7 +155,7 @@ internal static ResponsysSource DeserializeResponsysSource(JsonElement element)
                     disableMetricsCollection = JsonSerializer.Deserialize<DataFactoryElement<bool>>(property.Value.GetRawText());
                     continue;
                 }
-                additionalPropertiesDictionary.Add(property.Name, BinaryData.FromString(property.Value.GetRawText()));
+                additionalPropertiesDictionary.Add(property.Name, JsonSerializer.Deserialize<DataFactoryElement<string>>(property.Value.GetRawText()));
             }
             additionalProperties = additionalPropertiesDictionary;
             return new ResponsysSource(type, sourceRetryCount.Value, sourceRetryWait.Value, maxConcurrentConnections.Value, disableMetricsCollection.Value, additionalProperties, queryTimeout.Value, additionalColumns.Value, query.Value);
diff --git a/src/AzureDataFactory.TestingFramework/Generated/Models/ResponsysSource.cs b/src/AzureDataFactory.TestingFramework/Generated/Models/ResponsysSource.cs
index 7ef1d542..2825bbb9 100644
--- a/src/AzureDataFactory.TestingFramework/Generated/Models/ResponsysSource.cs
+++ b/src/AzureDataFactory.TestingFramework/Generated/Models/ResponsysSource.cs
@@ -28,7 +28,7 @@ public ResponsysSource()
         /// <param name="queryTimeout"> Query timeout. Type: string (or Expression with resultType string), pattern: ((\d+)\.)?(\d\d):(60|([0-5][0-9])):(60|([0-5][0-9])). </param>
         /// <param name="additionalColumns"> Specifies the additional columns to be added to source data. Type: array of objects(AdditionalColumns) (or Expression with resultType array of objects). </param>
         /// <param name="query"> A query to retrieve data from source. Type: string (or Expression with resultType string). </param>
-        internal ResponsysSource(string copySourceType, DataFactoryElement<int> sourceRetryCount, DataFactoryElement<string> sourceRetryWait, DataFactoryElement<int> maxConcurrentConnections, DataFactoryElement<bool> disableMetricsCollection, IDictionary<string, BinaryData> additionalProperties, DataFactoryElement<string> queryTimeout, BinaryData additionalColumns, DataFactoryElement<string> query) : base(copySourceType, sourceRetryCount, sourceRetryWait, maxConcurrentConnections, disableMetricsCollection, additionalProperties, queryTimeout, additionalColumns)
+        internal ResponsysSource(string copySourceType, DataFactoryElement<int> sourceRetryCount, DataFactoryElement<string> sourceRetryWait, DataFactoryElement<int> maxConcurrentConnections, DataFactoryElement<bool> disableMetricsCollection, IDictionary<string, DataFactoryElement<string>> additionalProperties, DataFactoryElement<string> queryTimeout, BinaryData additionalColumns, DataFactoryElement<string> query) : base(copySourceType, sourceRetryCount, sourceRetryWait, maxConcurrentConnections, disableMetricsCollection, additionalProperties, queryTimeout, additionalColumns)
         {
             Query = query;
             CopySourceType = copySourceType ?? "ResponsysSource";
diff --git a/src/AzureDataFactory.TestingFramework/Generated/Models/RestResourceDataset.Serialization.cs b/src/AzureDataFactory.TestingFramework/Generated/Models/RestResourceDataset.Serialization.cs
index 2dd83f6f..8393acf1 100644
--- a/src/AzureDataFactory.TestingFramework/Generated/Models/RestResourceDataset.Serialization.cs
+++ b/src/AzureDataFactory.TestingFramework/Generated/Models/RestResourceDataset.Serialization.cs
@@ -156,10 +156,10 @@ internal static RestResourceDataset DeserializeRestResourceDataset(JsonElement e
             Optional<DataFactoryElement<string>> relativeUrl = default;
             Optional<DataFactoryElement<string>> requestMethod = default;
             Optional<DataFactoryElement<string>> requestBody = default;
-            Optional<IDictionary<string, BinaryData>> additionalHeaders = default;
-            Optional<IDictionary<string, BinaryData>> paginationRules = default;
-            IDictionary<string, BinaryData> additionalProperties = default;
-            Dictionary<string, BinaryData> additionalPropertiesDictionary = new Dictionary<string, BinaryData>();
+            Optional<IDictionary<string, DataFactoryElement<string>>> additionalHeaders = default;
+            Optional<IDictionary<string, DataFactoryElement<string>>> paginationRules = default;
+            IDictionary<string, DataFactoryElement<string>> additionalProperties = default;
+            Dictionary<string, DataFactoryElement<string>> additionalPropertiesDictionary = new Dictionary<string, DataFactoryElement<string>>();
             foreach (var property in element.EnumerateObject())
             {
                 if (property.NameEquals("type"u8))
@@ -281,7 +281,7 @@ internal static RestResourceDataset DeserializeRestResourceDataset(JsonElement e
                             {
                                 continue;
                             }
-                            Dictionary<string, BinaryData> dictionary = new Dictionary<string, BinaryData>();
+                            Dictionary<string, DataFactoryElement<string>> dictionary = new Dictionary<string, DataFactoryElement<string>>();
                             foreach (var property1 in property0.Value.EnumerateObject())
                             {
                                 if (property1.Value.ValueKind == JsonValueKind.Null)
@@ -290,7 +290,7 @@ internal static RestResourceDataset DeserializeRestResourceDataset(JsonElement e
                                 }
                                 else
                                 {
-                                    dictionary.Add(property1.Name, BinaryData.FromString(property1.Value.GetRawText()));
+                                    dictionary.Add(property1.Name, JsonSerializer.Deserialize<DataFactoryElement<string>>(property1.Value.GetRawText()));
                                 }
                             }
                             additionalHeaders = dictionary;
@@ -302,7 +302,7 @@ internal static RestResourceDataset DeserializeRestResourceDataset(JsonElement e
                             {
                                 continue;
                             }
-                            Dictionary<string, BinaryData> dictionary = new Dictionary<string, BinaryData>();
+                            Dictionary<string, DataFactoryElement<string>> dictionary = new Dictionary<string, DataFactoryElement<string>>();
                             foreach (var property1 in property0.Value.EnumerateObject())
                             {
                                 if (property1.Value.ValueKind == JsonValueKind.Null)
@@ -311,7 +311,7 @@ internal static RestResourceDataset DeserializeRestResourceDataset(JsonElement e
                                 }
                                 else
                                 {
-                                    dictionary.Add(property1.Name, BinaryData.FromString(property1.Value.GetRawText()));
+                                    dictionary.Add(property1.Name, JsonSerializer.Deserialize<DataFactoryElement<string>>(property1.Value.GetRawText()));
                                 }
                             }
                             paginationRules = dictionary;
@@ -320,7 +320,7 @@ internal static RestResourceDataset DeserializeRestResourceDataset(JsonElement e
                     }
                     continue;
                 }
-                additionalPropertiesDictionary.Add(property.Name, BinaryData.FromString(property.Value.GetRawText()));
+                additionalPropertiesDictionary.Add(property.Name, JsonSerializer.Deserialize<DataFactoryElement<string>>(property.Value.GetRawText()));
             }
             additionalProperties = additionalPropertiesDictionary;
             return new RestResourceDataset(type, description.Value, structure.Value, schema.Value, linkedServiceName, Optional.ToDictionary(parameters), Optional.ToList(annotations), folder.Value, additionalProperties, relativeUrl.Value, requestMethod.Value, requestBody.Value, Optional.ToDictionary(additionalHeaders), Optional.ToDictionary(paginationRules));
diff --git a/src/AzureDataFactory.TestingFramework/Generated/Models/RestResourceDataset.cs b/src/AzureDataFactory.TestingFramework/Generated/Models/RestResourceDataset.cs
index 35e4199f..8cc16914 100644
--- a/src/AzureDataFactory.TestingFramework/Generated/Models/RestResourceDataset.cs
+++ b/src/AzureDataFactory.TestingFramework/Generated/Models/RestResourceDataset.cs
@@ -20,8 +20,8 @@ public RestResourceDataset(DataFactoryLinkedServiceReference linkedServiceName)
         {
             Argument.AssertNotNull(linkedServiceName, nameof(linkedServiceName));
 
-            AdditionalHeaders = new ChangeTrackingDictionary<string, BinaryData>();
-            PaginationRules = new ChangeTrackingDictionary<string, BinaryData>();
+            AdditionalHeaders = new ChangeTrackingDictionary<string, DataFactoryElement<string>>();
+            PaginationRules = new ChangeTrackingDictionary<string, DataFactoryElement<string>>();
             DatasetType = "RestResource";
         }
 
@@ -40,7 +40,7 @@ public RestResourceDataset(DataFactoryLinkedServiceReference linkedServiceName)
         /// <param name="requestBody"> The HTTP request body to the RESTful API if requestMethod is POST. Type: string (or Expression with resultType string). </param>
         /// <param name="additionalHeaders"> The additional HTTP headers in the request to the RESTful API. </param>
         /// <param name="paginationRules"> The pagination rules to compose next page requests. </param>
-        internal RestResourceDataset(string datasetType, string description, DataFactoryElement<IList<DatasetDataElement>> structure, DataFactoryElement<IList<DatasetSchemaDataElement>> schema, DataFactoryLinkedServiceReference linkedServiceName, IDictionary<string, EntityParameterSpecification> parameters, IList<BinaryData> annotations, DatasetFolder folder, IDictionary<string, BinaryData> additionalProperties, DataFactoryElement<string> relativeUri, DataFactoryElement<string> requestMethod, DataFactoryElement<string> requestBody, IDictionary<string, BinaryData> additionalHeaders, IDictionary<string, BinaryData> paginationRules) : base(datasetType, description, structure, schema, linkedServiceName, parameters, annotations, folder, additionalProperties)
+        internal RestResourceDataset(string datasetType, string description, DataFactoryElement<IList<DatasetDataElement>> structure, DataFactoryElement<IList<DatasetSchemaDataElement>> schema, DataFactoryLinkedServiceReference linkedServiceName, IDictionary<string, EntityParameterSpecification> parameters, IList<BinaryData> annotations, DatasetFolder folder, IDictionary<string, DataFactoryElement<string>> additionalProperties, DataFactoryElement<string> relativeUri, DataFactoryElement<string> requestMethod, DataFactoryElement<string> requestBody, IDictionary<string, DataFactoryElement<string>> additionalHeaders, IDictionary<string, DataFactoryElement<string>> paginationRules) : base(datasetType, description, structure, schema, linkedServiceName, parameters, annotations, folder, additionalProperties)
         {
             RelativeUri = relativeUri;
             RequestMethod = requestMethod;
@@ -86,7 +86,7 @@ internal RestResourceDataset(string datasetType, string description, DataFactory
         /// </list>
         /// </para>
         /// </summary>
-        public IDictionary<string, BinaryData> AdditionalHeaders { get; }
+        public IDictionary<string, DataFactoryElement<string>> AdditionalHeaders { get; }
         /// <summary>
         /// The pagination rules to compose next page requests.
         /// <para>
@@ -117,6 +117,6 @@ internal RestResourceDataset(string datasetType, string description, DataFactory
         /// </list>
         /// </para>
         /// </summary>
-        public IDictionary<string, BinaryData> PaginationRules { get; }
+        public IDictionary<string, DataFactoryElement<string>> PaginationRules { get; }
     }
 }
diff --git a/src/AzureDataFactory.TestingFramework/Generated/Models/RestServiceLinkedService.Serialization.cs b/src/AzureDataFactory.TestingFramework/Generated/Models/RestServiceLinkedService.Serialization.cs
index b8ead4f8..9b8b852e 100644
--- a/src/AzureDataFactory.TestingFramework/Generated/Models/RestServiceLinkedService.Serialization.cs
+++ b/src/AzureDataFactory.TestingFramework/Generated/Models/RestServiceLinkedService.Serialization.cs
@@ -186,8 +186,8 @@ internal static RestServiceLinkedService DeserializeRestServiceLinkedService(Jso
             Optional<DataFactoryElement<string>> tokenEndpoint = default;
             Optional<DataFactoryElement<string>> resource = default;
             Optional<DataFactoryElement<string>> scope = default;
-            IDictionary<string, BinaryData> additionalProperties = default;
-            Dictionary<string, BinaryData> additionalPropertiesDictionary = new Dictionary<string, BinaryData>();
+            IDictionary<string, DataFactoryElement<string>> additionalProperties = default;
+            Dictionary<string, DataFactoryElement<string>> additionalPropertiesDictionary = new Dictionary<string, DataFactoryElement<string>>();
             foreach (var property in element.EnumerateObject())
             {
                 if (property.NameEquals("type"u8))
@@ -406,7 +406,7 @@ internal static RestServiceLinkedService DeserializeRestServiceLinkedService(Jso
                     }
                     continue;
                 }
-                additionalPropertiesDictionary.Add(property.Name, BinaryData.FromString(property.Value.GetRawText()));
+                additionalPropertiesDictionary.Add(property.Name, JsonSerializer.Deserialize<DataFactoryElement<string>>(property.Value.GetRawText()));
             }
             additionalProperties = additionalPropertiesDictionary;
             return new RestServiceLinkedService(type, connectVia.Value, description.Value, Optional.ToDictionary(parameters), Optional.ToList(annotations), additionalProperties, url, enableServerCertificateValidation.Value, authenticationType, userName.Value, password, authHeaders.Value, servicePrincipalId.Value, servicePrincipalKey, tenant.Value, azureCloudType.Value, aadResourceId.Value, encryptedCredential.Value, credential.Value, clientId.Value, clientSecret, tokenEndpoint.Value, resource.Value, scope.Value);
diff --git a/src/AzureDataFactory.TestingFramework/Generated/Models/RestServiceLinkedService.cs b/src/AzureDataFactory.TestingFramework/Generated/Models/RestServiceLinkedService.cs
index 6160c041..2a9cf644 100644
--- a/src/AzureDataFactory.TestingFramework/Generated/Models/RestServiceLinkedService.cs
+++ b/src/AzureDataFactory.TestingFramework/Generated/Models/RestServiceLinkedService.cs
@@ -51,7 +51,7 @@ public RestServiceLinkedService(DataFactoryElement<string> uri, RestServiceAuthe
         /// <param name="tokenEndpoint"> The token endpoint of the authorization server to acquire access token. Type: string (or Expression with resultType string). </param>
         /// <param name="resource"> The target service or resource to which the access will be requested. Type: string (or Expression with resultType string). </param>
         /// <param name="scope"> The scope of the access required. It describes what kind of access will be requested. Type: string (or Expression with resultType string). </param>
-        internal RestServiceLinkedService(string linkedServiceType, IntegrationRuntimeReference connectVia, string description, IDictionary<string, EntityParameterSpecification> parameters, IList<BinaryData> annotations, IDictionary<string, BinaryData> additionalProperties, DataFactoryElement<string> uri, DataFactoryElement<bool> enableServerCertificateValidation, RestServiceAuthenticationType authenticationType, DataFactoryElement<string> userName, DataFactorySecretBaseDefinition password, DataFactoryElement<BinaryData> authHeaders, DataFactoryElement<string> servicePrincipalId, DataFactorySecretBaseDefinition servicePrincipalKey, DataFactoryElement<string> tenant, DataFactoryElement<string> azureCloudType, DataFactoryElement<string> aadResourceId, string encryptedCredential, DataFactoryCredentialReference credential, DataFactoryElement<string> clientId, DataFactorySecretBaseDefinition clientSecret, DataFactoryElement<string> tokenEndpoint, DataFactoryElement<string> resource, DataFactoryElement<string> scope) : base(linkedServiceType, connectVia, description, parameters, annotations, additionalProperties)
+        internal RestServiceLinkedService(string linkedServiceType, IntegrationRuntimeReference connectVia, string description, IDictionary<string, EntityParameterSpecification> parameters, IList<BinaryData> annotations, IDictionary<string, DataFactoryElement<string>> additionalProperties, DataFactoryElement<string> uri, DataFactoryElement<bool> enableServerCertificateValidation, RestServiceAuthenticationType authenticationType, DataFactoryElement<string> userName, DataFactorySecretBaseDefinition password, DataFactoryElement<BinaryData> authHeaders, DataFactoryElement<string> servicePrincipalId, DataFactorySecretBaseDefinition servicePrincipalKey, DataFactoryElement<string> tenant, DataFactoryElement<string> azureCloudType, DataFactoryElement<string> aadResourceId, string encryptedCredential, DataFactoryCredentialReference credential, DataFactoryElement<string> clientId, DataFactorySecretBaseDefinition clientSecret, DataFactoryElement<string> tokenEndpoint, DataFactoryElement<string> resource, DataFactoryElement<string> scope) : base(linkedServiceType, connectVia, description, parameters, annotations, additionalProperties)
         {
             Uri = uri;
             EnableServerCertificateValidation = enableServerCertificateValidation;
diff --git a/src/AzureDataFactory.TestingFramework/Generated/Models/RestSink.Serialization.cs b/src/AzureDataFactory.TestingFramework/Generated/Models/RestSink.Serialization.cs
index cb5d90ad..61f04f5e 100644
--- a/src/AzureDataFactory.TestingFramework/Generated/Models/RestSink.Serialization.cs
+++ b/src/AzureDataFactory.TestingFramework/Generated/Models/RestSink.Serialization.cs
@@ -111,8 +111,8 @@ internal static RestSink DeserializeRestSink(JsonElement element)
             Optional<DataFactoryElement<string>> sinkRetryWait = default;
             Optional<DataFactoryElement<int>> maxConcurrentConnections = default;
             Optional<DataFactoryElement<bool>> disableMetricsCollection = default;
-            IDictionary<string, BinaryData> additionalProperties = default;
-            Dictionary<string, BinaryData> additionalPropertiesDictionary = new Dictionary<string, BinaryData>();
+            IDictionary<string, DataFactoryElement<string>> additionalProperties = default;
+            Dictionary<string, DataFactoryElement<string>> additionalPropertiesDictionary = new Dictionary<string, DataFactoryElement<string>>();
             foreach (var property in element.EnumerateObject())
             {
                 if (property.NameEquals("requestMethod"u8))
@@ -219,7 +219,7 @@ internal static RestSink DeserializeRestSink(JsonElement element)
                     disableMetricsCollection = JsonSerializer.Deserialize<DataFactoryElement<bool>>(property.Value.GetRawText());
                     continue;
                 }
-                additionalPropertiesDictionary.Add(property.Name, BinaryData.FromString(property.Value.GetRawText()));
+                additionalPropertiesDictionary.Add(property.Name, JsonSerializer.Deserialize<DataFactoryElement<string>>(property.Value.GetRawText()));
             }
             additionalProperties = additionalPropertiesDictionary;
             return new RestSink(type, writeBatchSize.Value, writeBatchTimeout.Value, sinkRetryCount.Value, sinkRetryWait.Value, maxConcurrentConnections.Value, disableMetricsCollection.Value, additionalProperties, requestMethod.Value, additionalHeaders.Value, httpRequestTimeout.Value, requestInterval.Value, httpCompressionType.Value);
diff --git a/src/AzureDataFactory.TestingFramework/Generated/Models/RestSink.cs b/src/AzureDataFactory.TestingFramework/Generated/Models/RestSink.cs
index ecea68bf..d61eedfb 100644
--- a/src/AzureDataFactory.TestingFramework/Generated/Models/RestSink.cs
+++ b/src/AzureDataFactory.TestingFramework/Generated/Models/RestSink.cs
@@ -32,7 +32,7 @@ public RestSink()
         /// <param name="httpRequestTimeout"> The timeout (TimeSpan) to get an HTTP response. It is the timeout to get a response, not the timeout to read response data. Default value: 00:01:40. Type: string (or Expression with resultType string), pattern: ((\d+)\.)?(\d\d):(60|([0-5][0-9])):(60|([0-5][0-9])). </param>
         /// <param name="requestInterval"> The time to await before sending next request, in milliseconds. </param>
         /// <param name="httpCompressionType"> Http Compression Type to Send data in compressed format with Optimal Compression Level, Default is None. And The Only Supported option is Gzip. </param>
-        internal RestSink(string copySinkType, DataFactoryElement<int> writeBatchSize, DataFactoryElement<string> writeBatchTimeout, DataFactoryElement<int> sinkRetryCount, DataFactoryElement<string> sinkRetryWait, DataFactoryElement<int> maxConcurrentConnections, DataFactoryElement<bool> disableMetricsCollection, IDictionary<string, BinaryData> additionalProperties, DataFactoryElement<string> requestMethod, DataFactoryElement<string> additionalHeaders, DataFactoryElement<string> httpRequestTimeout, BinaryData requestInterval, BinaryData httpCompressionType) : base(copySinkType, writeBatchSize, writeBatchTimeout, sinkRetryCount, sinkRetryWait, maxConcurrentConnections, disableMetricsCollection, additionalProperties)
+        internal RestSink(string copySinkType, DataFactoryElement<int> writeBatchSize, DataFactoryElement<string> writeBatchTimeout, DataFactoryElement<int> sinkRetryCount, DataFactoryElement<string> sinkRetryWait, DataFactoryElement<int> maxConcurrentConnections, DataFactoryElement<bool> disableMetricsCollection, IDictionary<string, DataFactoryElement<string>> additionalProperties, DataFactoryElement<string> requestMethod, DataFactoryElement<string> additionalHeaders, DataFactoryElement<string> httpRequestTimeout, BinaryData requestInterval, BinaryData httpCompressionType) : base(copySinkType, writeBatchSize, writeBatchTimeout, sinkRetryCount, sinkRetryWait, maxConcurrentConnections, disableMetricsCollection, additionalProperties)
         {
             RequestMethod = requestMethod;
             AdditionalHeaders = additionalHeaders;
diff --git a/src/AzureDataFactory.TestingFramework/Generated/Models/RestSource.Serialization.cs b/src/AzureDataFactory.TestingFramework/Generated/Models/RestSource.Serialization.cs
index b0b26651..1fadea66 100644
--- a/src/AzureDataFactory.TestingFramework/Generated/Models/RestSource.Serialization.cs
+++ b/src/AzureDataFactory.TestingFramework/Generated/Models/RestSource.Serialization.cs
@@ -111,8 +111,8 @@ internal static RestSource DeserializeRestSource(JsonElement element)
             Optional<DataFactoryElement<string>> sourceRetryWait = default;
             Optional<DataFactoryElement<int>> maxConcurrentConnections = default;
             Optional<DataFactoryElement<bool>> disableMetricsCollection = default;
-            IDictionary<string, BinaryData> additionalProperties = default;
-            Dictionary<string, BinaryData> additionalPropertiesDictionary = new Dictionary<string, BinaryData>();
+            IDictionary<string, DataFactoryElement<string>> additionalProperties = default;
+            Dictionary<string, DataFactoryElement<string>> additionalPropertiesDictionary = new Dictionary<string, DataFactoryElement<string>>();
             foreach (var property in element.EnumerateObject())
             {
                 if (property.NameEquals("requestMethod"u8))
@@ -219,7 +219,7 @@ internal static RestSource DeserializeRestSource(JsonElement element)
                     disableMetricsCollection = JsonSerializer.Deserialize<DataFactoryElement<bool>>(property.Value.GetRawText());
                     continue;
                 }
-                additionalPropertiesDictionary.Add(property.Name, BinaryData.FromString(property.Value.GetRawText()));
+                additionalPropertiesDictionary.Add(property.Name, JsonSerializer.Deserialize<DataFactoryElement<string>>(property.Value.GetRawText()));
             }
             additionalProperties = additionalPropertiesDictionary;
             return new RestSource(type, sourceRetryCount.Value, sourceRetryWait.Value, maxConcurrentConnections.Value, disableMetricsCollection.Value, additionalProperties, requestMethod.Value, requestBody.Value, additionalHeaders.Value, paginationRules.Value, httpRequestTimeout.Value, requestInterval.Value, additionalColumns.Value);
diff --git a/src/AzureDataFactory.TestingFramework/Generated/Models/RestSource.cs b/src/AzureDataFactory.TestingFramework/Generated/Models/RestSource.cs
index 3e85cd6c..54d1856e 100644
--- a/src/AzureDataFactory.TestingFramework/Generated/Models/RestSource.cs
+++ b/src/AzureDataFactory.TestingFramework/Generated/Models/RestSource.cs
@@ -32,7 +32,7 @@ public RestSource()
         /// <param name="httpRequestTimeout"> The timeout (TimeSpan) to get an HTTP response. It is the timeout to get a response, not the timeout to read response data. Default value: 00:01:40. Type: string (or Expression with resultType string), pattern: ((\d+)\.)?(\d\d):(60|([0-5][0-9])):(60|([0-5][0-9])). </param>
         /// <param name="requestInterval"> The time to await before sending next page request. </param>
         /// <param name="additionalColumns"> Specifies the additional columns to be added to source data. Type: array of objects(AdditionalColumns) (or Expression with resultType array of objects). </param>
-        internal RestSource(string copySourceType, DataFactoryElement<int> sourceRetryCount, DataFactoryElement<string> sourceRetryWait, DataFactoryElement<int> maxConcurrentConnections, DataFactoryElement<bool> disableMetricsCollection, IDictionary<string, BinaryData> additionalProperties, DataFactoryElement<string> requestMethod, DataFactoryElement<string> requestBody, DataFactoryElement<string> additionalHeaders, DataFactoryElement<string> paginationRules, DataFactoryElement<string> httpRequestTimeout, BinaryData requestInterval, BinaryData additionalColumns) : base(copySourceType, sourceRetryCount, sourceRetryWait, maxConcurrentConnections, disableMetricsCollection, additionalProperties)
+        internal RestSource(string copySourceType, DataFactoryElement<int> sourceRetryCount, DataFactoryElement<string> sourceRetryWait, DataFactoryElement<int> maxConcurrentConnections, DataFactoryElement<bool> disableMetricsCollection, IDictionary<string, DataFactoryElement<string>> additionalProperties, DataFactoryElement<string> requestMethod, DataFactoryElement<string> requestBody, DataFactoryElement<string> additionalHeaders, DataFactoryElement<string> paginationRules, DataFactoryElement<string> httpRequestTimeout, BinaryData requestInterval, BinaryData additionalColumns) : base(copySourceType, sourceRetryCount, sourceRetryWait, maxConcurrentConnections, disableMetricsCollection, additionalProperties)
         {
             RequestMethod = requestMethod;
             RequestBody = requestBody;
diff --git a/src/AzureDataFactory.TestingFramework/Generated/Models/SalesforceLinkedService.Serialization.cs b/src/AzureDataFactory.TestingFramework/Generated/Models/SalesforceLinkedService.Serialization.cs
index fd6445f5..7d62cd75 100644
--- a/src/AzureDataFactory.TestingFramework/Generated/Models/SalesforceLinkedService.Serialization.cs
+++ b/src/AzureDataFactory.TestingFramework/Generated/Models/SalesforceLinkedService.Serialization.cs
@@ -120,8 +120,8 @@ internal static SalesforceLinkedService DeserializeSalesforceLinkedService(JsonE
             Optional<DataFactorySecretBaseDefinition> securityToken = default;
             Optional<DataFactoryElement<string>> apiVersion = default;
             Optional<string> encryptedCredential = default;
-            IDictionary<string, BinaryData> additionalProperties = default;
-            Dictionary<string, BinaryData> additionalPropertiesDictionary = new Dictionary<string, BinaryData>();
+            IDictionary<string, DataFactoryElement<string>> additionalProperties = default;
+            Dictionary<string, DataFactoryElement<string>> additionalPropertiesDictionary = new Dictionary<string, DataFactoryElement<string>>();
             foreach (var property in element.EnumerateObject())
             {
                 if (property.NameEquals("type"u8))
@@ -240,7 +240,7 @@ internal static SalesforceLinkedService DeserializeSalesforceLinkedService(JsonE
                     }
                     continue;
                 }
-                additionalPropertiesDictionary.Add(property.Name, BinaryData.FromString(property.Value.GetRawText()));
+                additionalPropertiesDictionary.Add(property.Name, JsonSerializer.Deserialize<DataFactoryElement<string>>(property.Value.GetRawText()));
             }
             additionalProperties = additionalPropertiesDictionary;
             return new SalesforceLinkedService(type, connectVia.Value, description.Value, Optional.ToDictionary(parameters), Optional.ToList(annotations), additionalProperties, environmentUrl.Value, username.Value, password, securityToken, apiVersion.Value, encryptedCredential.Value);
diff --git a/src/AzureDataFactory.TestingFramework/Generated/Models/SalesforceLinkedService.cs b/src/AzureDataFactory.TestingFramework/Generated/Models/SalesforceLinkedService.cs
index fd2e5b3e..01a18ecf 100644
--- a/src/AzureDataFactory.TestingFramework/Generated/Models/SalesforceLinkedService.cs
+++ b/src/AzureDataFactory.TestingFramework/Generated/Models/SalesforceLinkedService.cs
@@ -31,7 +31,7 @@ public SalesforceLinkedService()
         /// <param name="securityToken"> The security token is optional to remotely access Salesforce instance. </param>
         /// <param name="apiVersion"> The Salesforce API version used in ADF. Type: string (or Expression with resultType string). </param>
         /// <param name="encryptedCredential"> The encrypted credential used for authentication. Credentials are encrypted using the integration runtime credential manager. Type: string. </param>
-        internal SalesforceLinkedService(string linkedServiceType, IntegrationRuntimeReference connectVia, string description, IDictionary<string, EntityParameterSpecification> parameters, IList<BinaryData> annotations, IDictionary<string, BinaryData> additionalProperties, DataFactoryElement<string> environmentUri, DataFactoryElement<string> username, DataFactorySecretBaseDefinition password, DataFactorySecretBaseDefinition securityToken, DataFactoryElement<string> apiVersion, string encryptedCredential) : base(linkedServiceType, connectVia, description, parameters, annotations, additionalProperties)
+        internal SalesforceLinkedService(string linkedServiceType, IntegrationRuntimeReference connectVia, string description, IDictionary<string, EntityParameterSpecification> parameters, IList<BinaryData> annotations, IDictionary<string, DataFactoryElement<string>> additionalProperties, DataFactoryElement<string> environmentUri, DataFactoryElement<string> username, DataFactorySecretBaseDefinition password, DataFactorySecretBaseDefinition securityToken, DataFactoryElement<string> apiVersion, string encryptedCredential) : base(linkedServiceType, connectVia, description, parameters, annotations, additionalProperties)
         {
             EnvironmentUri = environmentUri;
             Username = username;
diff --git a/src/AzureDataFactory.TestingFramework/Generated/Models/SalesforceMarketingCloudLinkedService.Serialization.cs b/src/AzureDataFactory.TestingFramework/Generated/Models/SalesforceMarketingCloudLinkedService.Serialization.cs
index a1751a16..addf286f 100644
--- a/src/AzureDataFactory.TestingFramework/Generated/Models/SalesforceMarketingCloudLinkedService.Serialization.cs
+++ b/src/AzureDataFactory.TestingFramework/Generated/Models/SalesforceMarketingCloudLinkedService.Serialization.cs
@@ -130,8 +130,8 @@ internal static SalesforceMarketingCloudLinkedService DeserializeSalesforceMarke
             Optional<DataFactoryElement<bool>> useHostVerification = default;
             Optional<DataFactoryElement<bool>> usePeerVerification = default;
             Optional<string> encryptedCredential = default;
-            IDictionary<string, BinaryData> additionalProperties = default;
-            Dictionary<string, BinaryData> additionalPropertiesDictionary = new Dictionary<string, BinaryData>();
+            IDictionary<string, DataFactoryElement<string>> additionalProperties = default;
+            Dictionary<string, DataFactoryElement<string>> additionalPropertiesDictionary = new Dictionary<string, DataFactoryElement<string>>();
             foreach (var property in element.EnumerateObject())
             {
                 if (property.NameEquals("type"u8))
@@ -259,7 +259,7 @@ internal static SalesforceMarketingCloudLinkedService DeserializeSalesforceMarke
                     }
                     continue;
                 }
-                additionalPropertiesDictionary.Add(property.Name, BinaryData.FromString(property.Value.GetRawText()));
+                additionalPropertiesDictionary.Add(property.Name, JsonSerializer.Deserialize<DataFactoryElement<string>>(property.Value.GetRawText()));
             }
             additionalProperties = additionalPropertiesDictionary;
             return new SalesforceMarketingCloudLinkedService(type, connectVia.Value, description.Value, Optional.ToDictionary(parameters), Optional.ToList(annotations), additionalProperties, connectionProperties.Value, clientId.Value, clientSecret, useEncryptedEndpoints.Value, useHostVerification.Value, usePeerVerification.Value, encryptedCredential.Value);
diff --git a/src/AzureDataFactory.TestingFramework/Generated/Models/SalesforceMarketingCloudLinkedService.cs b/src/AzureDataFactory.TestingFramework/Generated/Models/SalesforceMarketingCloudLinkedService.cs
index 29405f27..fff504db 100644
--- a/src/AzureDataFactory.TestingFramework/Generated/Models/SalesforceMarketingCloudLinkedService.cs
+++ b/src/AzureDataFactory.TestingFramework/Generated/Models/SalesforceMarketingCloudLinkedService.cs
@@ -32,7 +32,7 @@ public SalesforceMarketingCloudLinkedService()
         /// <param name="useHostVerification"> Specifies whether to require the host name in the server's certificate to match the host name of the server when connecting over SSL. The default value is true. Type: boolean (or Expression with resultType boolean). </param>
         /// <param name="usePeerVerification"> Specifies whether to verify the identity of the server when connecting over SSL. The default value is true. Type: boolean (or Expression with resultType boolean). </param>
         /// <param name="encryptedCredential"> The encrypted credential used for authentication. Credentials are encrypted using the integration runtime credential manager. Type: string. </param>
-        internal SalesforceMarketingCloudLinkedService(string linkedServiceType, IntegrationRuntimeReference connectVia, string description, IDictionary<string, EntityParameterSpecification> parameters, IList<BinaryData> annotations, IDictionary<string, BinaryData> additionalProperties, BinaryData connectionProperties, DataFactoryElement<string> clientId, DataFactorySecretBaseDefinition clientSecret, DataFactoryElement<bool> useEncryptedEndpoints, DataFactoryElement<bool> useHostVerification, DataFactoryElement<bool> usePeerVerification, string encryptedCredential) : base(linkedServiceType, connectVia, description, parameters, annotations, additionalProperties)
+        internal SalesforceMarketingCloudLinkedService(string linkedServiceType, IntegrationRuntimeReference connectVia, string description, IDictionary<string, EntityParameterSpecification> parameters, IList<BinaryData> annotations, IDictionary<string, DataFactoryElement<string>> additionalProperties, BinaryData connectionProperties, DataFactoryElement<string> clientId, DataFactorySecretBaseDefinition clientSecret, DataFactoryElement<bool> useEncryptedEndpoints, DataFactoryElement<bool> useHostVerification, DataFactoryElement<bool> usePeerVerification, string encryptedCredential) : base(linkedServiceType, connectVia, description, parameters, annotations, additionalProperties)
         {
             ConnectionProperties = connectionProperties;
             ClientId = clientId;
diff --git a/src/AzureDataFactory.TestingFramework/Generated/Models/SalesforceMarketingCloudObjectDataset.Serialization.cs b/src/AzureDataFactory.TestingFramework/Generated/Models/SalesforceMarketingCloudObjectDataset.Serialization.cs
index 08fd2253..5b11a154 100644
--- a/src/AzureDataFactory.TestingFramework/Generated/Models/SalesforceMarketingCloudObjectDataset.Serialization.cs
+++ b/src/AzureDataFactory.TestingFramework/Generated/Models/SalesforceMarketingCloudObjectDataset.Serialization.cs
@@ -104,8 +104,8 @@ internal static SalesforceMarketingCloudObjectDataset DeserializeSalesforceMarke
             Optional<IList<BinaryData>> annotations = default;
             Optional<DatasetFolder> folder = default;
             Optional<DataFactoryElement<string>> tableName = default;
-            IDictionary<string, BinaryData> additionalProperties = default;
-            Dictionary<string, BinaryData> additionalPropertiesDictionary = new Dictionary<string, BinaryData>();
+            IDictionary<string, DataFactoryElement<string>> additionalProperties = default;
+            Dictionary<string, DataFactoryElement<string>> additionalPropertiesDictionary = new Dictionary<string, DataFactoryElement<string>>();
             foreach (var property in element.EnumerateObject())
             {
                 if (property.NameEquals("type"u8))
@@ -206,7 +206,7 @@ internal static SalesforceMarketingCloudObjectDataset DeserializeSalesforceMarke
                     }
                     continue;
                 }
-                additionalPropertiesDictionary.Add(property.Name, BinaryData.FromString(property.Value.GetRawText()));
+                additionalPropertiesDictionary.Add(property.Name, JsonSerializer.Deserialize<DataFactoryElement<string>>(property.Value.GetRawText()));
             }
             additionalProperties = additionalPropertiesDictionary;
             return new SalesforceMarketingCloudObjectDataset(type, description.Value, structure.Value, schema.Value, linkedServiceName, Optional.ToDictionary(parameters), Optional.ToList(annotations), folder.Value, additionalProperties, tableName.Value);
diff --git a/src/AzureDataFactory.TestingFramework/Generated/Models/SalesforceMarketingCloudObjectDataset.cs b/src/AzureDataFactory.TestingFramework/Generated/Models/SalesforceMarketingCloudObjectDataset.cs
index 6f1f6b04..bce9d6c0 100644
--- a/src/AzureDataFactory.TestingFramework/Generated/Models/SalesforceMarketingCloudObjectDataset.cs
+++ b/src/AzureDataFactory.TestingFramework/Generated/Models/SalesforceMarketingCloudObjectDataset.cs
@@ -34,7 +34,7 @@ public SalesforceMarketingCloudObjectDataset(DataFactoryLinkedServiceReference l
         /// <param name="folder"> The folder that this Dataset is in. If not specified, Dataset will appear at the root level. </param>
         /// <param name="additionalProperties"> Additional Properties. </param>
         /// <param name="tableName"> The table name. Type: string (or Expression with resultType string). </param>
-        internal SalesforceMarketingCloudObjectDataset(string datasetType, string description, DataFactoryElement<IList<DatasetDataElement>> structure, DataFactoryElement<IList<DatasetSchemaDataElement>> schema, DataFactoryLinkedServiceReference linkedServiceName, IDictionary<string, EntityParameterSpecification> parameters, IList<BinaryData> annotations, DatasetFolder folder, IDictionary<string, BinaryData> additionalProperties, DataFactoryElement<string> tableName) : base(datasetType, description, structure, schema, linkedServiceName, parameters, annotations, folder, additionalProperties)
+        internal SalesforceMarketingCloudObjectDataset(string datasetType, string description, DataFactoryElement<IList<DatasetDataElement>> structure, DataFactoryElement<IList<DatasetSchemaDataElement>> schema, DataFactoryLinkedServiceReference linkedServiceName, IDictionary<string, EntityParameterSpecification> parameters, IList<BinaryData> annotations, DatasetFolder folder, IDictionary<string, DataFactoryElement<string>> additionalProperties, DataFactoryElement<string> tableName) : base(datasetType, description, structure, schema, linkedServiceName, parameters, annotations, folder, additionalProperties)
         {
             TableName = tableName;
             DatasetType = datasetType ?? "SalesforceMarketingCloudObject";
diff --git a/src/AzureDataFactory.TestingFramework/Generated/Models/SalesforceMarketingCloudSource.Serialization.cs b/src/AzureDataFactory.TestingFramework/Generated/Models/SalesforceMarketingCloudSource.Serialization.cs
index f56cd382..cd41df28 100644
--- a/src/AzureDataFactory.TestingFramework/Generated/Models/SalesforceMarketingCloudSource.Serialization.cs
+++ b/src/AzureDataFactory.TestingFramework/Generated/Models/SalesforceMarketingCloudSource.Serialization.cs
@@ -83,8 +83,8 @@ internal static SalesforceMarketingCloudSource DeserializeSalesforceMarketingClo
             Optional<DataFactoryElement<string>> sourceRetryWait = default;
             Optional<DataFactoryElement<int>> maxConcurrentConnections = default;
             Optional<DataFactoryElement<bool>> disableMetricsCollection = default;
-            IDictionary<string, BinaryData> additionalProperties = default;
-            Dictionary<string, BinaryData> additionalPropertiesDictionary = new Dictionary<string, BinaryData>();
+            IDictionary<string, DataFactoryElement<string>> additionalProperties = default;
+            Dictionary<string, DataFactoryElement<string>> additionalPropertiesDictionary = new Dictionary<string, DataFactoryElement<string>>();
             foreach (var property in element.EnumerateObject())
             {
                 if (property.NameEquals("query"u8))
@@ -155,7 +155,7 @@ internal static SalesforceMarketingCloudSource DeserializeSalesforceMarketingClo
                     disableMetricsCollection = JsonSerializer.Deserialize<DataFactoryElement<bool>>(property.Value.GetRawText());
                     continue;
                 }
-                additionalPropertiesDictionary.Add(property.Name, BinaryData.FromString(property.Value.GetRawText()));
+                additionalPropertiesDictionary.Add(property.Name, JsonSerializer.Deserialize<DataFactoryElement<string>>(property.Value.GetRawText()));
             }
             additionalProperties = additionalPropertiesDictionary;
             return new SalesforceMarketingCloudSource(type, sourceRetryCount.Value, sourceRetryWait.Value, maxConcurrentConnections.Value, disableMetricsCollection.Value, additionalProperties, queryTimeout.Value, additionalColumns.Value, query.Value);
diff --git a/src/AzureDataFactory.TestingFramework/Generated/Models/SalesforceMarketingCloudSource.cs b/src/AzureDataFactory.TestingFramework/Generated/Models/SalesforceMarketingCloudSource.cs
index caf20ce8..c29a3927 100644
--- a/src/AzureDataFactory.TestingFramework/Generated/Models/SalesforceMarketingCloudSource.cs
+++ b/src/AzureDataFactory.TestingFramework/Generated/Models/SalesforceMarketingCloudSource.cs
@@ -28,7 +28,7 @@ public SalesforceMarketingCloudSource()
         /// <param name="queryTimeout"> Query timeout. Type: string (or Expression with resultType string), pattern: ((\d+)\.)?(\d\d):(60|([0-5][0-9])):(60|([0-5][0-9])). </param>
         /// <param name="additionalColumns"> Specifies the additional columns to be added to source data. Type: array of objects(AdditionalColumns) (or Expression with resultType array of objects). </param>
         /// <param name="query"> A query to retrieve data from source. Type: string (or Expression with resultType string). </param>
-        internal SalesforceMarketingCloudSource(string copySourceType, DataFactoryElement<int> sourceRetryCount, DataFactoryElement<string> sourceRetryWait, DataFactoryElement<int> maxConcurrentConnections, DataFactoryElement<bool> disableMetricsCollection, IDictionary<string, BinaryData> additionalProperties, DataFactoryElement<string> queryTimeout, BinaryData additionalColumns, DataFactoryElement<string> query) : base(copySourceType, sourceRetryCount, sourceRetryWait, maxConcurrentConnections, disableMetricsCollection, additionalProperties, queryTimeout, additionalColumns)
+        internal SalesforceMarketingCloudSource(string copySourceType, DataFactoryElement<int> sourceRetryCount, DataFactoryElement<string> sourceRetryWait, DataFactoryElement<int> maxConcurrentConnections, DataFactoryElement<bool> disableMetricsCollection, IDictionary<string, DataFactoryElement<string>> additionalProperties, DataFactoryElement<string> queryTimeout, BinaryData additionalColumns, DataFactoryElement<string> query) : base(copySourceType, sourceRetryCount, sourceRetryWait, maxConcurrentConnections, disableMetricsCollection, additionalProperties, queryTimeout, additionalColumns)
         {
             Query = query;
             CopySourceType = copySourceType ?? "SalesforceMarketingCloudSource";
diff --git a/src/AzureDataFactory.TestingFramework/Generated/Models/SalesforceObjectDataset.Serialization.cs b/src/AzureDataFactory.TestingFramework/Generated/Models/SalesforceObjectDataset.Serialization.cs
index fd6b495c..5975de4c 100644
--- a/src/AzureDataFactory.TestingFramework/Generated/Models/SalesforceObjectDataset.Serialization.cs
+++ b/src/AzureDataFactory.TestingFramework/Generated/Models/SalesforceObjectDataset.Serialization.cs
@@ -104,8 +104,8 @@ internal static SalesforceObjectDataset DeserializeSalesforceObjectDataset(JsonE
             Optional<IList<BinaryData>> annotations = default;
             Optional<DatasetFolder> folder = default;
             Optional<DataFactoryElement<string>> objectApiName = default;
-            IDictionary<string, BinaryData> additionalProperties = default;
-            Dictionary<string, BinaryData> additionalPropertiesDictionary = new Dictionary<string, BinaryData>();
+            IDictionary<string, DataFactoryElement<string>> additionalProperties = default;
+            Dictionary<string, DataFactoryElement<string>> additionalPropertiesDictionary = new Dictionary<string, DataFactoryElement<string>>();
             foreach (var property in element.EnumerateObject())
             {
                 if (property.NameEquals("type"u8))
@@ -206,7 +206,7 @@ internal static SalesforceObjectDataset DeserializeSalesforceObjectDataset(JsonE
                     }
                     continue;
                 }
-                additionalPropertiesDictionary.Add(property.Name, BinaryData.FromString(property.Value.GetRawText()));
+                additionalPropertiesDictionary.Add(property.Name, JsonSerializer.Deserialize<DataFactoryElement<string>>(property.Value.GetRawText()));
             }
             additionalProperties = additionalPropertiesDictionary;
             return new SalesforceObjectDataset(type, description.Value, structure.Value, schema.Value, linkedServiceName, Optional.ToDictionary(parameters), Optional.ToList(annotations), folder.Value, additionalProperties, objectApiName.Value);
diff --git a/src/AzureDataFactory.TestingFramework/Generated/Models/SalesforceObjectDataset.cs b/src/AzureDataFactory.TestingFramework/Generated/Models/SalesforceObjectDataset.cs
index 4c0b24fd..41e5c3c9 100644
--- a/src/AzureDataFactory.TestingFramework/Generated/Models/SalesforceObjectDataset.cs
+++ b/src/AzureDataFactory.TestingFramework/Generated/Models/SalesforceObjectDataset.cs
@@ -34,7 +34,7 @@ public SalesforceObjectDataset(DataFactoryLinkedServiceReference linkedServiceNa
         /// <param name="folder"> The folder that this Dataset is in. If not specified, Dataset will appear at the root level. </param>
         /// <param name="additionalProperties"> Additional Properties. </param>
         /// <param name="objectApiName"> The Salesforce object API name. Type: string (or Expression with resultType string). </param>
-        internal SalesforceObjectDataset(string datasetType, string description, DataFactoryElement<IList<DatasetDataElement>> structure, DataFactoryElement<IList<DatasetSchemaDataElement>> schema, DataFactoryLinkedServiceReference linkedServiceName, IDictionary<string, EntityParameterSpecification> parameters, IList<BinaryData> annotations, DatasetFolder folder, IDictionary<string, BinaryData> additionalProperties, DataFactoryElement<string> objectApiName) : base(datasetType, description, structure, schema, linkedServiceName, parameters, annotations, folder, additionalProperties)
+        internal SalesforceObjectDataset(string datasetType, string description, DataFactoryElement<IList<DatasetDataElement>> structure, DataFactoryElement<IList<DatasetSchemaDataElement>> schema, DataFactoryLinkedServiceReference linkedServiceName, IDictionary<string, EntityParameterSpecification> parameters, IList<BinaryData> annotations, DatasetFolder folder, IDictionary<string, DataFactoryElement<string>> additionalProperties, DataFactoryElement<string> objectApiName) : base(datasetType, description, structure, schema, linkedServiceName, parameters, annotations, folder, additionalProperties)
         {
             ObjectApiName = objectApiName;
             DatasetType = datasetType ?? "SalesforceObject";
diff --git a/src/AzureDataFactory.TestingFramework/Generated/Models/SalesforceServiceCloudLinkedService.Serialization.cs b/src/AzureDataFactory.TestingFramework/Generated/Models/SalesforceServiceCloudLinkedService.Serialization.cs
index 01de56d8..4e870f95 100644
--- a/src/AzureDataFactory.TestingFramework/Generated/Models/SalesforceServiceCloudLinkedService.Serialization.cs
+++ b/src/AzureDataFactory.TestingFramework/Generated/Models/SalesforceServiceCloudLinkedService.Serialization.cs
@@ -126,8 +126,8 @@ internal static SalesforceServiceCloudLinkedService DeserializeSalesforceService
             Optional<DataFactoryElement<string>> apiVersion = default;
             Optional<DataFactoryElement<string>> extendedProperties = default;
             Optional<string> encryptedCredential = default;
-            IDictionary<string, BinaryData> additionalProperties = default;
-            Dictionary<string, BinaryData> additionalPropertiesDictionary = new Dictionary<string, BinaryData>();
+            IDictionary<string, DataFactoryElement<string>> additionalProperties = default;
+            Dictionary<string, DataFactoryElement<string>> additionalPropertiesDictionary = new Dictionary<string, DataFactoryElement<string>>();
             foreach (var property in element.EnumerateObject())
             {
                 if (property.NameEquals("type"u8))
@@ -255,7 +255,7 @@ internal static SalesforceServiceCloudLinkedService DeserializeSalesforceService
                     }
                     continue;
                 }
-                additionalPropertiesDictionary.Add(property.Name, BinaryData.FromString(property.Value.GetRawText()));
+                additionalPropertiesDictionary.Add(property.Name, JsonSerializer.Deserialize<DataFactoryElement<string>>(property.Value.GetRawText()));
             }
             additionalProperties = additionalPropertiesDictionary;
             return new SalesforceServiceCloudLinkedService(type, connectVia.Value, description.Value, Optional.ToDictionary(parameters), Optional.ToList(annotations), additionalProperties, environmentUrl.Value, username.Value, password, securityToken, apiVersion.Value, extendedProperties.Value, encryptedCredential.Value);
diff --git a/src/AzureDataFactory.TestingFramework/Generated/Models/SalesforceServiceCloudLinkedService.cs b/src/AzureDataFactory.TestingFramework/Generated/Models/SalesforceServiceCloudLinkedService.cs
index 111f70ab..8dffd722 100644
--- a/src/AzureDataFactory.TestingFramework/Generated/Models/SalesforceServiceCloudLinkedService.cs
+++ b/src/AzureDataFactory.TestingFramework/Generated/Models/SalesforceServiceCloudLinkedService.cs
@@ -32,7 +32,7 @@ public SalesforceServiceCloudLinkedService()
         /// <param name="apiVersion"> The Salesforce API version used in ADF. Type: string (or Expression with resultType string). </param>
         /// <param name="extendedProperties"> Extended properties appended to the connection string. Type: string (or Expression with resultType string). </param>
         /// <param name="encryptedCredential"> The encrypted credential used for authentication. Credentials are encrypted using the integration runtime credential manager. Type: string. </param>
-        internal SalesforceServiceCloudLinkedService(string linkedServiceType, IntegrationRuntimeReference connectVia, string description, IDictionary<string, EntityParameterSpecification> parameters, IList<BinaryData> annotations, IDictionary<string, BinaryData> additionalProperties, DataFactoryElement<string> environmentUri, DataFactoryElement<string> username, DataFactorySecretBaseDefinition password, DataFactorySecretBaseDefinition securityToken, DataFactoryElement<string> apiVersion, DataFactoryElement<string> extendedProperties, string encryptedCredential) : base(linkedServiceType, connectVia, description, parameters, annotations, additionalProperties)
+        internal SalesforceServiceCloudLinkedService(string linkedServiceType, IntegrationRuntimeReference connectVia, string description, IDictionary<string, EntityParameterSpecification> parameters, IList<BinaryData> annotations, IDictionary<string, DataFactoryElement<string>> additionalProperties, DataFactoryElement<string> environmentUri, DataFactoryElement<string> username, DataFactorySecretBaseDefinition password, DataFactorySecretBaseDefinition securityToken, DataFactoryElement<string> apiVersion, DataFactoryElement<string> extendedProperties, string encryptedCredential) : base(linkedServiceType, connectVia, description, parameters, annotations, additionalProperties)
         {
             EnvironmentUri = environmentUri;
             Username = username;
diff --git a/src/AzureDataFactory.TestingFramework/Generated/Models/SalesforceServiceCloudObjectDataset.Serialization.cs b/src/AzureDataFactory.TestingFramework/Generated/Models/SalesforceServiceCloudObjectDataset.Serialization.cs
index e59cd229..d723747c 100644
--- a/src/AzureDataFactory.TestingFramework/Generated/Models/SalesforceServiceCloudObjectDataset.Serialization.cs
+++ b/src/AzureDataFactory.TestingFramework/Generated/Models/SalesforceServiceCloudObjectDataset.Serialization.cs
@@ -104,8 +104,8 @@ internal static SalesforceServiceCloudObjectDataset DeserializeSalesforceService
             Optional<IList<BinaryData>> annotations = default;
             Optional<DatasetFolder> folder = default;
             Optional<DataFactoryElement<string>> objectApiName = default;
-            IDictionary<string, BinaryData> additionalProperties = default;
-            Dictionary<string, BinaryData> additionalPropertiesDictionary = new Dictionary<string, BinaryData>();
+            IDictionary<string, DataFactoryElement<string>> additionalProperties = default;
+            Dictionary<string, DataFactoryElement<string>> additionalPropertiesDictionary = new Dictionary<string, DataFactoryElement<string>>();
             foreach (var property in element.EnumerateObject())
             {
                 if (property.NameEquals("type"u8))
@@ -206,7 +206,7 @@ internal static SalesforceServiceCloudObjectDataset DeserializeSalesforceService
                     }
                     continue;
                 }
-                additionalPropertiesDictionary.Add(property.Name, BinaryData.FromString(property.Value.GetRawText()));
+                additionalPropertiesDictionary.Add(property.Name, JsonSerializer.Deserialize<DataFactoryElement<string>>(property.Value.GetRawText()));
             }
             additionalProperties = additionalPropertiesDictionary;
             return new SalesforceServiceCloudObjectDataset(type, description.Value, structure.Value, schema.Value, linkedServiceName, Optional.ToDictionary(parameters), Optional.ToList(annotations), folder.Value, additionalProperties, objectApiName.Value);
diff --git a/src/AzureDataFactory.TestingFramework/Generated/Models/SalesforceServiceCloudObjectDataset.cs b/src/AzureDataFactory.TestingFramework/Generated/Models/SalesforceServiceCloudObjectDataset.cs
index 65528a88..6d89d266 100644
--- a/src/AzureDataFactory.TestingFramework/Generated/Models/SalesforceServiceCloudObjectDataset.cs
+++ b/src/AzureDataFactory.TestingFramework/Generated/Models/SalesforceServiceCloudObjectDataset.cs
@@ -34,7 +34,7 @@ public SalesforceServiceCloudObjectDataset(DataFactoryLinkedServiceReference lin
         /// <param name="folder"> The folder that this Dataset is in. If not specified, Dataset will appear at the root level. </param>
         /// <param name="additionalProperties"> Additional Properties. </param>
         /// <param name="objectApiName"> The Salesforce Service Cloud object API name. Type: string (or Expression with resultType string). </param>
-        internal SalesforceServiceCloudObjectDataset(string datasetType, string description, DataFactoryElement<IList<DatasetDataElement>> structure, DataFactoryElement<IList<DatasetSchemaDataElement>> schema, DataFactoryLinkedServiceReference linkedServiceName, IDictionary<string, EntityParameterSpecification> parameters, IList<BinaryData> annotations, DatasetFolder folder, IDictionary<string, BinaryData> additionalProperties, DataFactoryElement<string> objectApiName) : base(datasetType, description, structure, schema, linkedServiceName, parameters, annotations, folder, additionalProperties)
+        internal SalesforceServiceCloudObjectDataset(string datasetType, string description, DataFactoryElement<IList<DatasetDataElement>> structure, DataFactoryElement<IList<DatasetSchemaDataElement>> schema, DataFactoryLinkedServiceReference linkedServiceName, IDictionary<string, EntityParameterSpecification> parameters, IList<BinaryData> annotations, DatasetFolder folder, IDictionary<string, DataFactoryElement<string>> additionalProperties, DataFactoryElement<string> objectApiName) : base(datasetType, description, structure, schema, linkedServiceName, parameters, annotations, folder, additionalProperties)
         {
             ObjectApiName = objectApiName;
             DatasetType = datasetType ?? "SalesforceServiceCloudObject";
diff --git a/src/AzureDataFactory.TestingFramework/Generated/Models/SalesforceServiceCloudSink.Serialization.cs b/src/AzureDataFactory.TestingFramework/Generated/Models/SalesforceServiceCloudSink.Serialization.cs
index 931875bd..d2c871ab 100644
--- a/src/AzureDataFactory.TestingFramework/Generated/Models/SalesforceServiceCloudSink.Serialization.cs
+++ b/src/AzureDataFactory.TestingFramework/Generated/Models/SalesforceServiceCloudSink.Serialization.cs
@@ -91,8 +91,8 @@ internal static SalesforceServiceCloudSink DeserializeSalesforceServiceCloudSink
             Optional<DataFactoryElement<string>> sinkRetryWait = default;
             Optional<DataFactoryElement<int>> maxConcurrentConnections = default;
             Optional<DataFactoryElement<bool>> disableMetricsCollection = default;
-            IDictionary<string, BinaryData> additionalProperties = default;
-            Dictionary<string, BinaryData> additionalPropertiesDictionary = new Dictionary<string, BinaryData>();
+            IDictionary<string, DataFactoryElement<string>> additionalProperties = default;
+            Dictionary<string, DataFactoryElement<string>> additionalPropertiesDictionary = new Dictionary<string, DataFactoryElement<string>>();
             foreach (var property in element.EnumerateObject())
             {
                 if (property.NameEquals("writeBehavior"u8))
@@ -181,7 +181,7 @@ internal static SalesforceServiceCloudSink DeserializeSalesforceServiceCloudSink
                     disableMetricsCollection = JsonSerializer.Deserialize<DataFactoryElement<bool>>(property.Value.GetRawText());
                     continue;
                 }
-                additionalPropertiesDictionary.Add(property.Name, BinaryData.FromString(property.Value.GetRawText()));
+                additionalPropertiesDictionary.Add(property.Name, JsonSerializer.Deserialize<DataFactoryElement<string>>(property.Value.GetRawText()));
             }
             additionalProperties = additionalPropertiesDictionary;
             return new SalesforceServiceCloudSink(type, writeBatchSize.Value, writeBatchTimeout.Value, sinkRetryCount.Value, sinkRetryWait.Value, maxConcurrentConnections.Value, disableMetricsCollection.Value, additionalProperties, Optional.ToNullable(writeBehavior), externalIdFieldName.Value, ignoreNullValues.Value);
diff --git a/src/AzureDataFactory.TestingFramework/Generated/Models/SalesforceServiceCloudSink.cs b/src/AzureDataFactory.TestingFramework/Generated/Models/SalesforceServiceCloudSink.cs
index 6c6e060d..2d414d45 100644
--- a/src/AzureDataFactory.TestingFramework/Generated/Models/SalesforceServiceCloudSink.cs
+++ b/src/AzureDataFactory.TestingFramework/Generated/Models/SalesforceServiceCloudSink.cs
@@ -30,7 +30,7 @@ public SalesforceServiceCloudSink()
         /// <param name="writeBehavior"> The write behavior for the operation. Default is Insert. </param>
         /// <param name="externalIdFieldName"> The name of the external ID field for upsert operation. Default value is 'Id' column. Type: string (or Expression with resultType string). </param>
         /// <param name="ignoreNullValues"> The flag indicating whether or not to ignore null values from input dataset (except key fields) during write operation. Default value is false. If set it to true, it means ADF will leave the data in the destination object unchanged when doing upsert/update operation and insert defined default value when doing insert operation, versus ADF will update the data in the destination object to NULL when doing upsert/update operation and insert NULL value when doing insert operation. Type: boolean (or Expression with resultType boolean). </param>
-        internal SalesforceServiceCloudSink(string copySinkType, DataFactoryElement<int> writeBatchSize, DataFactoryElement<string> writeBatchTimeout, DataFactoryElement<int> sinkRetryCount, DataFactoryElement<string> sinkRetryWait, DataFactoryElement<int> maxConcurrentConnections, DataFactoryElement<bool> disableMetricsCollection, IDictionary<string, BinaryData> additionalProperties, SalesforceSinkWriteBehavior? writeBehavior, DataFactoryElement<string> externalIdFieldName, DataFactoryElement<bool> ignoreNullValues) : base(copySinkType, writeBatchSize, writeBatchTimeout, sinkRetryCount, sinkRetryWait, maxConcurrentConnections, disableMetricsCollection, additionalProperties)
+        internal SalesforceServiceCloudSink(string copySinkType, DataFactoryElement<int> writeBatchSize, DataFactoryElement<string> writeBatchTimeout, DataFactoryElement<int> sinkRetryCount, DataFactoryElement<string> sinkRetryWait, DataFactoryElement<int> maxConcurrentConnections, DataFactoryElement<bool> disableMetricsCollection, IDictionary<string, DataFactoryElement<string>> additionalProperties, SalesforceSinkWriteBehavior? writeBehavior, DataFactoryElement<string> externalIdFieldName, DataFactoryElement<bool> ignoreNullValues) : base(copySinkType, writeBatchSize, writeBatchTimeout, sinkRetryCount, sinkRetryWait, maxConcurrentConnections, disableMetricsCollection, additionalProperties)
         {
             WriteBehavior = writeBehavior;
             ExternalIdFieldName = externalIdFieldName;
diff --git a/src/AzureDataFactory.TestingFramework/Generated/Models/SalesforceServiceCloudSource.Serialization.cs b/src/AzureDataFactory.TestingFramework/Generated/Models/SalesforceServiceCloudSource.Serialization.cs
index c088d9f1..0bbc1447 100644
--- a/src/AzureDataFactory.TestingFramework/Generated/Models/SalesforceServiceCloudSource.Serialization.cs
+++ b/src/AzureDataFactory.TestingFramework/Generated/Models/SalesforceServiceCloudSource.Serialization.cs
@@ -83,8 +83,8 @@ internal static SalesforceServiceCloudSource DeserializeSalesforceServiceCloudSo
             Optional<DataFactoryElement<string>> sourceRetryWait = default;
             Optional<DataFactoryElement<int>> maxConcurrentConnections = default;
             Optional<DataFactoryElement<bool>> disableMetricsCollection = default;
-            IDictionary<string, BinaryData> additionalProperties = default;
-            Dictionary<string, BinaryData> additionalPropertiesDictionary = new Dictionary<string, BinaryData>();
+            IDictionary<string, DataFactoryElement<string>> additionalProperties = default;
+            Dictionary<string, DataFactoryElement<string>> additionalPropertiesDictionary = new Dictionary<string, DataFactoryElement<string>>();
             foreach (var property in element.EnumerateObject())
             {
                 if (property.NameEquals("query"u8))
@@ -155,7 +155,7 @@ internal static SalesforceServiceCloudSource DeserializeSalesforceServiceCloudSo
                     disableMetricsCollection = JsonSerializer.Deserialize<DataFactoryElement<bool>>(property.Value.GetRawText());
                     continue;
                 }
-                additionalPropertiesDictionary.Add(property.Name, BinaryData.FromString(property.Value.GetRawText()));
+                additionalPropertiesDictionary.Add(property.Name, JsonSerializer.Deserialize<DataFactoryElement<string>>(property.Value.GetRawText()));
             }
             additionalProperties = additionalPropertiesDictionary;
             return new SalesforceServiceCloudSource(type, sourceRetryCount.Value, sourceRetryWait.Value, maxConcurrentConnections.Value, disableMetricsCollection.Value, additionalProperties, query.Value, readBehavior.Value, additionalColumns.Value);
diff --git a/src/AzureDataFactory.TestingFramework/Generated/Models/SalesforceServiceCloudSource.cs b/src/AzureDataFactory.TestingFramework/Generated/Models/SalesforceServiceCloudSource.cs
index aa0e53e1..49474878 100644
--- a/src/AzureDataFactory.TestingFramework/Generated/Models/SalesforceServiceCloudSource.cs
+++ b/src/AzureDataFactory.TestingFramework/Generated/Models/SalesforceServiceCloudSource.cs
@@ -28,7 +28,7 @@ public SalesforceServiceCloudSource()
         /// <param name="query"> Database query. Type: string (or Expression with resultType string). </param>
         /// <param name="readBehavior"> The read behavior for the operation. Default is Query. Allowed values: Query/QueryAll. Type: string (or Expression with resultType string). </param>
         /// <param name="additionalColumns"> Specifies the additional columns to be added to source data. Type: array of objects(AdditionalColumns) (or Expression with resultType array of objects). </param>
-        internal SalesforceServiceCloudSource(string copySourceType, DataFactoryElement<int> sourceRetryCount, DataFactoryElement<string> sourceRetryWait, DataFactoryElement<int> maxConcurrentConnections, DataFactoryElement<bool> disableMetricsCollection, IDictionary<string, BinaryData> additionalProperties, DataFactoryElement<string> query, DataFactoryElement<string> readBehavior, BinaryData additionalColumns) : base(copySourceType, sourceRetryCount, sourceRetryWait, maxConcurrentConnections, disableMetricsCollection, additionalProperties)
+        internal SalesforceServiceCloudSource(string copySourceType, DataFactoryElement<int> sourceRetryCount, DataFactoryElement<string> sourceRetryWait, DataFactoryElement<int> maxConcurrentConnections, DataFactoryElement<bool> disableMetricsCollection, IDictionary<string, DataFactoryElement<string>> additionalProperties, DataFactoryElement<string> query, DataFactoryElement<string> readBehavior, BinaryData additionalColumns) : base(copySourceType, sourceRetryCount, sourceRetryWait, maxConcurrentConnections, disableMetricsCollection, additionalProperties)
         {
             Query = query;
             ReadBehavior = readBehavior;
diff --git a/src/AzureDataFactory.TestingFramework/Generated/Models/SalesforceSink.Serialization.cs b/src/AzureDataFactory.TestingFramework/Generated/Models/SalesforceSink.Serialization.cs
index 260016ba..c56196b3 100644
--- a/src/AzureDataFactory.TestingFramework/Generated/Models/SalesforceSink.Serialization.cs
+++ b/src/AzureDataFactory.TestingFramework/Generated/Models/SalesforceSink.Serialization.cs
@@ -91,8 +91,8 @@ internal static SalesforceSink DeserializeSalesforceSink(JsonElement element)
             Optional<DataFactoryElement<string>> sinkRetryWait = default;
             Optional<DataFactoryElement<int>> maxConcurrentConnections = default;
             Optional<DataFactoryElement<bool>> disableMetricsCollection = default;
-            IDictionary<string, BinaryData> additionalProperties = default;
-            Dictionary<string, BinaryData> additionalPropertiesDictionary = new Dictionary<string, BinaryData>();
+            IDictionary<string, DataFactoryElement<string>> additionalProperties = default;
+            Dictionary<string, DataFactoryElement<string>> additionalPropertiesDictionary = new Dictionary<string, DataFactoryElement<string>>();
             foreach (var property in element.EnumerateObject())
             {
                 if (property.NameEquals("writeBehavior"u8))
@@ -181,7 +181,7 @@ internal static SalesforceSink DeserializeSalesforceSink(JsonElement element)
                     disableMetricsCollection = JsonSerializer.Deserialize<DataFactoryElement<bool>>(property.Value.GetRawText());
                     continue;
                 }
-                additionalPropertiesDictionary.Add(property.Name, BinaryData.FromString(property.Value.GetRawText()));
+                additionalPropertiesDictionary.Add(property.Name, JsonSerializer.Deserialize<DataFactoryElement<string>>(property.Value.GetRawText()));
             }
             additionalProperties = additionalPropertiesDictionary;
             return new SalesforceSink(type, writeBatchSize.Value, writeBatchTimeout.Value, sinkRetryCount.Value, sinkRetryWait.Value, maxConcurrentConnections.Value, disableMetricsCollection.Value, additionalProperties, Optional.ToNullable(writeBehavior), externalIdFieldName.Value, ignoreNullValues.Value);
diff --git a/src/AzureDataFactory.TestingFramework/Generated/Models/SalesforceSink.cs b/src/AzureDataFactory.TestingFramework/Generated/Models/SalesforceSink.cs
index b1296a41..a558e463 100644
--- a/src/AzureDataFactory.TestingFramework/Generated/Models/SalesforceSink.cs
+++ b/src/AzureDataFactory.TestingFramework/Generated/Models/SalesforceSink.cs
@@ -30,7 +30,7 @@ public SalesforceSink()
         /// <param name="writeBehavior"> The write behavior for the operation. Default is Insert. </param>
         /// <param name="externalIdFieldName"> The name of the external ID field for upsert operation. Default value is 'Id' column. Type: string (or Expression with resultType string). </param>
         /// <param name="ignoreNullValues"> The flag indicating whether or not to ignore null values from input dataset (except key fields) during write operation. Default value is false. If set it to true, it means ADF will leave the data in the destination object unchanged when doing upsert/update operation and insert defined default value when doing insert operation, versus ADF will update the data in the destination object to NULL when doing upsert/update operation and insert NULL value when doing insert operation. Type: boolean (or Expression with resultType boolean). </param>
-        internal SalesforceSink(string copySinkType, DataFactoryElement<int> writeBatchSize, DataFactoryElement<string> writeBatchTimeout, DataFactoryElement<int> sinkRetryCount, DataFactoryElement<string> sinkRetryWait, DataFactoryElement<int> maxConcurrentConnections, DataFactoryElement<bool> disableMetricsCollection, IDictionary<string, BinaryData> additionalProperties, SalesforceSinkWriteBehavior? writeBehavior, DataFactoryElement<string> externalIdFieldName, DataFactoryElement<bool> ignoreNullValues) : base(copySinkType, writeBatchSize, writeBatchTimeout, sinkRetryCount, sinkRetryWait, maxConcurrentConnections, disableMetricsCollection, additionalProperties)
+        internal SalesforceSink(string copySinkType, DataFactoryElement<int> writeBatchSize, DataFactoryElement<string> writeBatchTimeout, DataFactoryElement<int> sinkRetryCount, DataFactoryElement<string> sinkRetryWait, DataFactoryElement<int> maxConcurrentConnections, DataFactoryElement<bool> disableMetricsCollection, IDictionary<string, DataFactoryElement<string>> additionalProperties, SalesforceSinkWriteBehavior? writeBehavior, DataFactoryElement<string> externalIdFieldName, DataFactoryElement<bool> ignoreNullValues) : base(copySinkType, writeBatchSize, writeBatchTimeout, sinkRetryCount, sinkRetryWait, maxConcurrentConnections, disableMetricsCollection, additionalProperties)
         {
             WriteBehavior = writeBehavior;
             ExternalIdFieldName = externalIdFieldName;
diff --git a/src/AzureDataFactory.TestingFramework/Generated/Models/SalesforceSource.Serialization.cs b/src/AzureDataFactory.TestingFramework/Generated/Models/SalesforceSource.Serialization.cs
index 84cda647..a1fa76fc 100644
--- a/src/AzureDataFactory.TestingFramework/Generated/Models/SalesforceSource.Serialization.cs
+++ b/src/AzureDataFactory.TestingFramework/Generated/Models/SalesforceSource.Serialization.cs
@@ -89,8 +89,8 @@ internal static SalesforceSource DeserializeSalesforceSource(JsonElement element
             Optional<DataFactoryElement<string>> sourceRetryWait = default;
             Optional<DataFactoryElement<int>> maxConcurrentConnections = default;
             Optional<DataFactoryElement<bool>> disableMetricsCollection = default;
-            IDictionary<string, BinaryData> additionalProperties = default;
-            Dictionary<string, BinaryData> additionalPropertiesDictionary = new Dictionary<string, BinaryData>();
+            IDictionary<string, DataFactoryElement<string>> additionalProperties = default;
+            Dictionary<string, DataFactoryElement<string>> additionalPropertiesDictionary = new Dictionary<string, DataFactoryElement<string>>();
             foreach (var property in element.EnumerateObject())
             {
                 if (property.NameEquals("query"u8))
@@ -170,7 +170,7 @@ internal static SalesforceSource DeserializeSalesforceSource(JsonElement element
                     disableMetricsCollection = JsonSerializer.Deserialize<DataFactoryElement<bool>>(property.Value.GetRawText());
                     continue;
                 }
-                additionalPropertiesDictionary.Add(property.Name, BinaryData.FromString(property.Value.GetRawText()));
+                additionalPropertiesDictionary.Add(property.Name, JsonSerializer.Deserialize<DataFactoryElement<string>>(property.Value.GetRawText()));
             }
             additionalProperties = additionalPropertiesDictionary;
             return new SalesforceSource(type, sourceRetryCount.Value, sourceRetryWait.Value, maxConcurrentConnections.Value, disableMetricsCollection.Value, additionalProperties, queryTimeout.Value, additionalColumns.Value, query.Value, readBehavior.Value);
diff --git a/src/AzureDataFactory.TestingFramework/Generated/Models/SalesforceSource.cs b/src/AzureDataFactory.TestingFramework/Generated/Models/SalesforceSource.cs
index 2b03b499..3b8e5301 100644
--- a/src/AzureDataFactory.TestingFramework/Generated/Models/SalesforceSource.cs
+++ b/src/AzureDataFactory.TestingFramework/Generated/Models/SalesforceSource.cs
@@ -29,7 +29,7 @@ public SalesforceSource()
         /// <param name="additionalColumns"> Specifies the additional columns to be added to source data. Type: array of objects(AdditionalColumns) (or Expression with resultType array of objects). </param>
         /// <param name="query"> Database query. Type: string (or Expression with resultType string). </param>
         /// <param name="readBehavior"> The read behavior for the operation. Default is Query. Allowed values: Query/QueryAll. Type: string (or Expression with resultType string). </param>
-        internal SalesforceSource(string copySourceType, DataFactoryElement<int> sourceRetryCount, DataFactoryElement<string> sourceRetryWait, DataFactoryElement<int> maxConcurrentConnections, DataFactoryElement<bool> disableMetricsCollection, IDictionary<string, BinaryData> additionalProperties, DataFactoryElement<string> queryTimeout, BinaryData additionalColumns, DataFactoryElement<string> query, DataFactoryElement<string> readBehavior) : base(copySourceType, sourceRetryCount, sourceRetryWait, maxConcurrentConnections, disableMetricsCollection, additionalProperties, queryTimeout, additionalColumns)
+        internal SalesforceSource(string copySourceType, DataFactoryElement<int> sourceRetryCount, DataFactoryElement<string> sourceRetryWait, DataFactoryElement<int> maxConcurrentConnections, DataFactoryElement<bool> disableMetricsCollection, IDictionary<string, DataFactoryElement<string>> additionalProperties, DataFactoryElement<string> queryTimeout, BinaryData additionalColumns, DataFactoryElement<string> query, DataFactoryElement<string> readBehavior) : base(copySourceType, sourceRetryCount, sourceRetryWait, maxConcurrentConnections, disableMetricsCollection, additionalProperties, queryTimeout, additionalColumns)
         {
             Query = query;
             ReadBehavior = readBehavior;
diff --git a/src/AzureDataFactory.TestingFramework/Generated/Models/SapBWCubeDataset.Serialization.cs b/src/AzureDataFactory.TestingFramework/Generated/Models/SapBWCubeDataset.Serialization.cs
index 48585bfe..7494c9a0 100644
--- a/src/AzureDataFactory.TestingFramework/Generated/Models/SapBWCubeDataset.Serialization.cs
+++ b/src/AzureDataFactory.TestingFramework/Generated/Models/SapBWCubeDataset.Serialization.cs
@@ -95,8 +95,8 @@ internal static SapBWCubeDataset DeserializeSapBWCubeDataset(JsonElement element
             Optional<IDictionary<string, EntityParameterSpecification>> parameters = default;
             Optional<IList<BinaryData>> annotations = default;
             Optional<DatasetFolder> folder = default;
-            IDictionary<string, BinaryData> additionalProperties = default;
-            Dictionary<string, BinaryData> additionalPropertiesDictionary = new Dictionary<string, BinaryData>();
+            IDictionary<string, DataFactoryElement<string>> additionalProperties = default;
+            Dictionary<string, DataFactoryElement<string>> additionalPropertiesDictionary = new Dictionary<string, DataFactoryElement<string>>();
             foreach (var property in element.EnumerateObject())
             {
                 if (property.NameEquals("type"u8))
@@ -176,7 +176,7 @@ internal static SapBWCubeDataset DeserializeSapBWCubeDataset(JsonElement element
                     folder = DatasetFolder.DeserializeDatasetFolder(property.Value);
                     continue;
                 }
-                additionalPropertiesDictionary.Add(property.Name, BinaryData.FromString(property.Value.GetRawText()));
+                additionalPropertiesDictionary.Add(property.Name, JsonSerializer.Deserialize<DataFactoryElement<string>>(property.Value.GetRawText()));
             }
             additionalProperties = additionalPropertiesDictionary;
             return new SapBWCubeDataset(type, description.Value, structure.Value, schema.Value, linkedServiceName, Optional.ToDictionary(parameters), Optional.ToList(annotations), folder.Value, additionalProperties);
diff --git a/src/AzureDataFactory.TestingFramework/Generated/Models/SapBWCubeDataset.cs b/src/AzureDataFactory.TestingFramework/Generated/Models/SapBWCubeDataset.cs
index 91b798e5..41870c7e 100644
--- a/src/AzureDataFactory.TestingFramework/Generated/Models/SapBWCubeDataset.cs
+++ b/src/AzureDataFactory.TestingFramework/Generated/Models/SapBWCubeDataset.cs
@@ -33,7 +33,7 @@ public SapBWCubeDataset(DataFactoryLinkedServiceReference linkedServiceName) : b
         /// <param name="annotations"> List of tags that can be used for describing the Dataset. </param>
         /// <param name="folder"> The folder that this Dataset is in. If not specified, Dataset will appear at the root level. </param>
         /// <param name="additionalProperties"> Additional Properties. </param>
-        internal SapBWCubeDataset(string datasetType, string description, DataFactoryElement<IList<DatasetDataElement>> structure, DataFactoryElement<IList<DatasetSchemaDataElement>> schema, DataFactoryLinkedServiceReference linkedServiceName, IDictionary<string, EntityParameterSpecification> parameters, IList<BinaryData> annotations, DatasetFolder folder, IDictionary<string, BinaryData> additionalProperties) : base(datasetType, description, structure, schema, linkedServiceName, parameters, annotations, folder, additionalProperties)
+        internal SapBWCubeDataset(string datasetType, string description, DataFactoryElement<IList<DatasetDataElement>> structure, DataFactoryElement<IList<DatasetSchemaDataElement>> schema, DataFactoryLinkedServiceReference linkedServiceName, IDictionary<string, EntityParameterSpecification> parameters, IList<BinaryData> annotations, DatasetFolder folder, IDictionary<string, DataFactoryElement<string>> additionalProperties) : base(datasetType, description, structure, schema, linkedServiceName, parameters, annotations, folder, additionalProperties)
         {
             DatasetType = datasetType ?? "SapBwCube";
         }
diff --git a/src/AzureDataFactory.TestingFramework/Generated/Models/SapBWLinkedService.Serialization.cs b/src/AzureDataFactory.TestingFramework/Generated/Models/SapBWLinkedService.Serialization.cs
index 707fede9..e9ae9218 100644
--- a/src/AzureDataFactory.TestingFramework/Generated/Models/SapBWLinkedService.Serialization.cs
+++ b/src/AzureDataFactory.TestingFramework/Generated/Models/SapBWLinkedService.Serialization.cs
@@ -111,8 +111,8 @@ internal static SapBWLinkedService DeserializeSapBWLinkedService(JsonElement ele
             Optional<DataFactoryElement<string>> userName = default;
             Optional<DataFactorySecretBaseDefinition> password = default;
             Optional<string> encryptedCredential = default;
-            IDictionary<string, BinaryData> additionalProperties = default;
-            Dictionary<string, BinaryData> additionalPropertiesDictionary = new Dictionary<string, BinaryData>();
+            IDictionary<string, DataFactoryElement<string>> additionalProperties = default;
+            Dictionary<string, DataFactoryElement<string>> additionalPropertiesDictionary = new Dictionary<string, DataFactoryElement<string>>();
             foreach (var property in element.EnumerateObject())
             {
                 if (property.NameEquals("type"u8))
@@ -219,7 +219,7 @@ internal static SapBWLinkedService DeserializeSapBWLinkedService(JsonElement ele
                     }
                     continue;
                 }
-                additionalPropertiesDictionary.Add(property.Name, BinaryData.FromString(property.Value.GetRawText()));
+                additionalPropertiesDictionary.Add(property.Name, JsonSerializer.Deserialize<DataFactoryElement<string>>(property.Value.GetRawText()));
             }
             additionalProperties = additionalPropertiesDictionary;
             return new SapBWLinkedService(type, connectVia.Value, description.Value, Optional.ToDictionary(parameters), Optional.ToList(annotations), additionalProperties, server, systemNumber, clientId, userName.Value, password, encryptedCredential.Value);
diff --git a/src/AzureDataFactory.TestingFramework/Generated/Models/SapBWLinkedService.cs b/src/AzureDataFactory.TestingFramework/Generated/Models/SapBWLinkedService.cs
index 9b1e115b..ba276076 100644
--- a/src/AzureDataFactory.TestingFramework/Generated/Models/SapBWLinkedService.cs
+++ b/src/AzureDataFactory.TestingFramework/Generated/Models/SapBWLinkedService.cs
@@ -43,7 +43,7 @@ public SapBWLinkedService(DataFactoryElement<string> server, DataFactoryElement<
         /// <param name="userName"> Username to access the SAP BW server. Type: string (or Expression with resultType string). </param>
         /// <param name="password"> Password to access the SAP BW server. </param>
         /// <param name="encryptedCredential"> The encrypted credential used for authentication. Credentials are encrypted using the integration runtime credential manager. Type: string. </param>
-        internal SapBWLinkedService(string linkedServiceType, IntegrationRuntimeReference connectVia, string description, IDictionary<string, EntityParameterSpecification> parameters, IList<BinaryData> annotations, IDictionary<string, BinaryData> additionalProperties, DataFactoryElement<string> server, DataFactoryElement<string> systemNumber, DataFactoryElement<string> clientId, DataFactoryElement<string> userName, DataFactorySecretBaseDefinition password, string encryptedCredential) : base(linkedServiceType, connectVia, description, parameters, annotations, additionalProperties)
+        internal SapBWLinkedService(string linkedServiceType, IntegrationRuntimeReference connectVia, string description, IDictionary<string, EntityParameterSpecification> parameters, IList<BinaryData> annotations, IDictionary<string, DataFactoryElement<string>> additionalProperties, DataFactoryElement<string> server, DataFactoryElement<string> systemNumber, DataFactoryElement<string> clientId, DataFactoryElement<string> userName, DataFactorySecretBaseDefinition password, string encryptedCredential) : base(linkedServiceType, connectVia, description, parameters, annotations, additionalProperties)
         {
             Server = server;
             SystemNumber = systemNumber;
diff --git a/src/AzureDataFactory.TestingFramework/Generated/Models/SapBWSource.Serialization.cs b/src/AzureDataFactory.TestingFramework/Generated/Models/SapBWSource.Serialization.cs
index 868faabe..ec3e2e60 100644
--- a/src/AzureDataFactory.TestingFramework/Generated/Models/SapBWSource.Serialization.cs
+++ b/src/AzureDataFactory.TestingFramework/Generated/Models/SapBWSource.Serialization.cs
@@ -83,8 +83,8 @@ internal static SapBWSource DeserializeSapBWSource(JsonElement element)
             Optional<DataFactoryElement<string>> sourceRetryWait = default;
             Optional<DataFactoryElement<int>> maxConcurrentConnections = default;
             Optional<DataFactoryElement<bool>> disableMetricsCollection = default;
-            IDictionary<string, BinaryData> additionalProperties = default;
-            Dictionary<string, BinaryData> additionalPropertiesDictionary = new Dictionary<string, BinaryData>();
+            IDictionary<string, DataFactoryElement<string>> additionalProperties = default;
+            Dictionary<string, DataFactoryElement<string>> additionalPropertiesDictionary = new Dictionary<string, DataFactoryElement<string>>();
             foreach (var property in element.EnumerateObject())
             {
                 if (property.NameEquals("query"u8))
@@ -155,7 +155,7 @@ internal static SapBWSource DeserializeSapBWSource(JsonElement element)
                     disableMetricsCollection = JsonSerializer.Deserialize<DataFactoryElement<bool>>(property.Value.GetRawText());
                     continue;
                 }
-                additionalPropertiesDictionary.Add(property.Name, BinaryData.FromString(property.Value.GetRawText()));
+                additionalPropertiesDictionary.Add(property.Name, JsonSerializer.Deserialize<DataFactoryElement<string>>(property.Value.GetRawText()));
             }
             additionalProperties = additionalPropertiesDictionary;
             return new SapBWSource(type, sourceRetryCount.Value, sourceRetryWait.Value, maxConcurrentConnections.Value, disableMetricsCollection.Value, additionalProperties, queryTimeout.Value, additionalColumns.Value, query.Value);
diff --git a/src/AzureDataFactory.TestingFramework/Generated/Models/SapBWSource.cs b/src/AzureDataFactory.TestingFramework/Generated/Models/SapBWSource.cs
index 45872440..962e9b62 100644
--- a/src/AzureDataFactory.TestingFramework/Generated/Models/SapBWSource.cs
+++ b/src/AzureDataFactory.TestingFramework/Generated/Models/SapBWSource.cs
@@ -28,7 +28,7 @@ public SapBWSource()
         /// <param name="queryTimeout"> Query timeout. Type: string (or Expression with resultType string), pattern: ((\d+)\.)?(\d\d):(60|([0-5][0-9])):(60|([0-5][0-9])). </param>
         /// <param name="additionalColumns"> Specifies the additional columns to be added to source data. Type: array of objects(AdditionalColumns) (or Expression with resultType array of objects). </param>
         /// <param name="query"> MDX query. Type: string (or Expression with resultType string). </param>
-        internal SapBWSource(string copySourceType, DataFactoryElement<int> sourceRetryCount, DataFactoryElement<string> sourceRetryWait, DataFactoryElement<int> maxConcurrentConnections, DataFactoryElement<bool> disableMetricsCollection, IDictionary<string, BinaryData> additionalProperties, DataFactoryElement<string> queryTimeout, BinaryData additionalColumns, DataFactoryElement<string> query) : base(copySourceType, sourceRetryCount, sourceRetryWait, maxConcurrentConnections, disableMetricsCollection, additionalProperties, queryTimeout, additionalColumns)
+        internal SapBWSource(string copySourceType, DataFactoryElement<int> sourceRetryCount, DataFactoryElement<string> sourceRetryWait, DataFactoryElement<int> maxConcurrentConnections, DataFactoryElement<bool> disableMetricsCollection, IDictionary<string, DataFactoryElement<string>> additionalProperties, DataFactoryElement<string> queryTimeout, BinaryData additionalColumns, DataFactoryElement<string> query) : base(copySourceType, sourceRetryCount, sourceRetryWait, maxConcurrentConnections, disableMetricsCollection, additionalProperties, queryTimeout, additionalColumns)
         {
             Query = query;
             CopySourceType = copySourceType ?? "SapBwSource";
diff --git a/src/AzureDataFactory.TestingFramework/Generated/Models/SapCloudForCustomerLinkedService.Serialization.cs b/src/AzureDataFactory.TestingFramework/Generated/Models/SapCloudForCustomerLinkedService.Serialization.cs
index 96334657..55087de0 100644
--- a/src/AzureDataFactory.TestingFramework/Generated/Models/SapCloudForCustomerLinkedService.Serialization.cs
+++ b/src/AzureDataFactory.TestingFramework/Generated/Models/SapCloudForCustomerLinkedService.Serialization.cs
@@ -105,8 +105,8 @@ internal static SapCloudForCustomerLinkedService DeserializeSapCloudForCustomerL
             Optional<DataFactoryElement<string>> username = default;
             Optional<DataFactorySecretBaseDefinition> password = default;
             Optional<string> encryptedCredential = default;
-            IDictionary<string, BinaryData> additionalProperties = default;
-            Dictionary<string, BinaryData> additionalPropertiesDictionary = new Dictionary<string, BinaryData>();
+            IDictionary<string, DataFactoryElement<string>> additionalProperties = default;
+            Dictionary<string, DataFactoryElement<string>> additionalPropertiesDictionary = new Dictionary<string, DataFactoryElement<string>>();
             foreach (var property in element.EnumerateObject())
             {
                 if (property.NameEquals("type"u8))
@@ -203,7 +203,7 @@ internal static SapCloudForCustomerLinkedService DeserializeSapCloudForCustomerL
                     }
                     continue;
                 }
-                additionalPropertiesDictionary.Add(property.Name, BinaryData.FromString(property.Value.GetRawText()));
+                additionalPropertiesDictionary.Add(property.Name, JsonSerializer.Deserialize<DataFactoryElement<string>>(property.Value.GetRawText()));
             }
             additionalProperties = additionalPropertiesDictionary;
             return new SapCloudForCustomerLinkedService(type, connectVia.Value, description.Value, Optional.ToDictionary(parameters), Optional.ToList(annotations), additionalProperties, url, username.Value, password, encryptedCredential.Value);
diff --git a/src/AzureDataFactory.TestingFramework/Generated/Models/SapCloudForCustomerLinkedService.cs b/src/AzureDataFactory.TestingFramework/Generated/Models/SapCloudForCustomerLinkedService.cs
index aee945f2..9b825966 100644
--- a/src/AzureDataFactory.TestingFramework/Generated/Models/SapCloudForCustomerLinkedService.cs
+++ b/src/AzureDataFactory.TestingFramework/Generated/Models/SapCloudForCustomerLinkedService.cs
@@ -35,7 +35,7 @@ public SapCloudForCustomerLinkedService(DataFactoryElement<string> uri)
         /// <param name="username"> The username for Basic authentication. Type: string (or Expression with resultType string). </param>
         /// <param name="password"> The password for Basic authentication. </param>
         /// <param name="encryptedCredential"> The encrypted credential used for authentication. Credentials are encrypted using the integration runtime credential manager. Either encryptedCredential or username/password must be provided. Type: string. </param>
-        internal SapCloudForCustomerLinkedService(string linkedServiceType, IntegrationRuntimeReference connectVia, string description, IDictionary<string, EntityParameterSpecification> parameters, IList<BinaryData> annotations, IDictionary<string, BinaryData> additionalProperties, DataFactoryElement<string> uri, DataFactoryElement<string> username, DataFactorySecretBaseDefinition password, string encryptedCredential) : base(linkedServiceType, connectVia, description, parameters, annotations, additionalProperties)
+        internal SapCloudForCustomerLinkedService(string linkedServiceType, IntegrationRuntimeReference connectVia, string description, IDictionary<string, EntityParameterSpecification> parameters, IList<BinaryData> annotations, IDictionary<string, DataFactoryElement<string>> additionalProperties, DataFactoryElement<string> uri, DataFactoryElement<string> username, DataFactorySecretBaseDefinition password, string encryptedCredential) : base(linkedServiceType, connectVia, description, parameters, annotations, additionalProperties)
         {
             Uri = uri;
             Username = username;
diff --git a/src/AzureDataFactory.TestingFramework/Generated/Models/SapCloudForCustomerResourceDataset.Serialization.cs b/src/AzureDataFactory.TestingFramework/Generated/Models/SapCloudForCustomerResourceDataset.Serialization.cs
index 7bf6eee2..e13803b8 100644
--- a/src/AzureDataFactory.TestingFramework/Generated/Models/SapCloudForCustomerResourceDataset.Serialization.cs
+++ b/src/AzureDataFactory.TestingFramework/Generated/Models/SapCloudForCustomerResourceDataset.Serialization.cs
@@ -101,8 +101,8 @@ internal static SapCloudForCustomerResourceDataset DeserializeSapCloudForCustome
             Optional<IList<BinaryData>> annotations = default;
             Optional<DatasetFolder> folder = default;
             DataFactoryElement<string> path = default;
-            IDictionary<string, BinaryData> additionalProperties = default;
-            Dictionary<string, BinaryData> additionalPropertiesDictionary = new Dictionary<string, BinaryData>();
+            IDictionary<string, DataFactoryElement<string>> additionalProperties = default;
+            Dictionary<string, DataFactoryElement<string>> additionalPropertiesDictionary = new Dictionary<string, DataFactoryElement<string>>();
             foreach (var property in element.EnumerateObject())
             {
                 if (property.NameEquals("type"u8))
@@ -199,7 +199,7 @@ internal static SapCloudForCustomerResourceDataset DeserializeSapCloudForCustome
                     }
                     continue;
                 }
-                additionalPropertiesDictionary.Add(property.Name, BinaryData.FromString(property.Value.GetRawText()));
+                additionalPropertiesDictionary.Add(property.Name, JsonSerializer.Deserialize<DataFactoryElement<string>>(property.Value.GetRawText()));
             }
             additionalProperties = additionalPropertiesDictionary;
             return new SapCloudForCustomerResourceDataset(type, description.Value, structure.Value, schema.Value, linkedServiceName, Optional.ToDictionary(parameters), Optional.ToList(annotations), folder.Value, additionalProperties, path);
diff --git a/src/AzureDataFactory.TestingFramework/Generated/Models/SapCloudForCustomerResourceDataset.cs b/src/AzureDataFactory.TestingFramework/Generated/Models/SapCloudForCustomerResourceDataset.cs
index f5d592a5..d24b47c6 100644
--- a/src/AzureDataFactory.TestingFramework/Generated/Models/SapCloudForCustomerResourceDataset.cs
+++ b/src/AzureDataFactory.TestingFramework/Generated/Models/SapCloudForCustomerResourceDataset.cs
@@ -37,7 +37,7 @@ public SapCloudForCustomerResourceDataset(DataFactoryLinkedServiceReference link
         /// <param name="folder"> The folder that this Dataset is in. If not specified, Dataset will appear at the root level. </param>
         /// <param name="additionalProperties"> Additional Properties. </param>
         /// <param name="path"> The path of the SAP Cloud for Customer OData entity. Type: string (or Expression with resultType string). </param>
-        internal SapCloudForCustomerResourceDataset(string datasetType, string description, DataFactoryElement<IList<DatasetDataElement>> structure, DataFactoryElement<IList<DatasetSchemaDataElement>> schema, DataFactoryLinkedServiceReference linkedServiceName, IDictionary<string, EntityParameterSpecification> parameters, IList<BinaryData> annotations, DatasetFolder folder, IDictionary<string, BinaryData> additionalProperties, DataFactoryElement<string> path) : base(datasetType, description, structure, schema, linkedServiceName, parameters, annotations, folder, additionalProperties)
+        internal SapCloudForCustomerResourceDataset(string datasetType, string description, DataFactoryElement<IList<DatasetDataElement>> structure, DataFactoryElement<IList<DatasetSchemaDataElement>> schema, DataFactoryLinkedServiceReference linkedServiceName, IDictionary<string, EntityParameterSpecification> parameters, IList<BinaryData> annotations, DatasetFolder folder, IDictionary<string, DataFactoryElement<string>> additionalProperties, DataFactoryElement<string> path) : base(datasetType, description, structure, schema, linkedServiceName, parameters, annotations, folder, additionalProperties)
         {
             Path = path;
             DatasetType = datasetType ?? "SapCloudForCustomerResource";
diff --git a/src/AzureDataFactory.TestingFramework/Generated/Models/SapCloudForCustomerSink.Serialization.cs b/src/AzureDataFactory.TestingFramework/Generated/Models/SapCloudForCustomerSink.Serialization.cs
index bf5624df..6392af0a 100644
--- a/src/AzureDataFactory.TestingFramework/Generated/Models/SapCloudForCustomerSink.Serialization.cs
+++ b/src/AzureDataFactory.TestingFramework/Generated/Models/SapCloudForCustomerSink.Serialization.cs
@@ -85,8 +85,8 @@ internal static SapCloudForCustomerSink DeserializeSapCloudForCustomerSink(JsonE
             Optional<DataFactoryElement<string>> sinkRetryWait = default;
             Optional<DataFactoryElement<int>> maxConcurrentConnections = default;
             Optional<DataFactoryElement<bool>> disableMetricsCollection = default;
-            IDictionary<string, BinaryData> additionalProperties = default;
-            Dictionary<string, BinaryData> additionalPropertiesDictionary = new Dictionary<string, BinaryData>();
+            IDictionary<string, DataFactoryElement<string>> additionalProperties = default;
+            Dictionary<string, DataFactoryElement<string>> additionalPropertiesDictionary = new Dictionary<string, DataFactoryElement<string>>();
             foreach (var property in element.EnumerateObject())
             {
                 if (property.NameEquals("writeBehavior"u8))
@@ -166,7 +166,7 @@ internal static SapCloudForCustomerSink DeserializeSapCloudForCustomerSink(JsonE
                     disableMetricsCollection = JsonSerializer.Deserialize<DataFactoryElement<bool>>(property.Value.GetRawText());
                     continue;
                 }
-                additionalPropertiesDictionary.Add(property.Name, BinaryData.FromString(property.Value.GetRawText()));
+                additionalPropertiesDictionary.Add(property.Name, JsonSerializer.Deserialize<DataFactoryElement<string>>(property.Value.GetRawText()));
             }
             additionalProperties = additionalPropertiesDictionary;
             return new SapCloudForCustomerSink(type, writeBatchSize.Value, writeBatchTimeout.Value, sinkRetryCount.Value, sinkRetryWait.Value, maxConcurrentConnections.Value, disableMetricsCollection.Value, additionalProperties, Optional.ToNullable(writeBehavior), httpRequestTimeout.Value);
diff --git a/src/AzureDataFactory.TestingFramework/Generated/Models/SapCloudForCustomerSink.cs b/src/AzureDataFactory.TestingFramework/Generated/Models/SapCloudForCustomerSink.cs
index bd112f80..728ed8dc 100644
--- a/src/AzureDataFactory.TestingFramework/Generated/Models/SapCloudForCustomerSink.cs
+++ b/src/AzureDataFactory.TestingFramework/Generated/Models/SapCloudForCustomerSink.cs
@@ -29,7 +29,7 @@ public SapCloudForCustomerSink()
         /// <param name="additionalProperties"> Additional Properties. </param>
         /// <param name="writeBehavior"> The write behavior for the operation. Default is 'Insert'. </param>
         /// <param name="httpRequestTimeout"> The timeout (TimeSpan) to get an HTTP response. It is the timeout to get a response, not the timeout to read response data. Default value: 00:05:00. Type: string (or Expression with resultType string), pattern: ((\d+)\.)?(\d\d):(60|([0-5][0-9])):(60|([0-5][0-9])). </param>
-        internal SapCloudForCustomerSink(string copySinkType, DataFactoryElement<int> writeBatchSize, DataFactoryElement<string> writeBatchTimeout, DataFactoryElement<int> sinkRetryCount, DataFactoryElement<string> sinkRetryWait, DataFactoryElement<int> maxConcurrentConnections, DataFactoryElement<bool> disableMetricsCollection, IDictionary<string, BinaryData> additionalProperties, SapCloudForCustomerSinkWriteBehavior? writeBehavior, DataFactoryElement<string> httpRequestTimeout) : base(copySinkType, writeBatchSize, writeBatchTimeout, sinkRetryCount, sinkRetryWait, maxConcurrentConnections, disableMetricsCollection, additionalProperties)
+        internal SapCloudForCustomerSink(string copySinkType, DataFactoryElement<int> writeBatchSize, DataFactoryElement<string> writeBatchTimeout, DataFactoryElement<int> sinkRetryCount, DataFactoryElement<string> sinkRetryWait, DataFactoryElement<int> maxConcurrentConnections, DataFactoryElement<bool> disableMetricsCollection, IDictionary<string, DataFactoryElement<string>> additionalProperties, SapCloudForCustomerSinkWriteBehavior? writeBehavior, DataFactoryElement<string> httpRequestTimeout) : base(copySinkType, writeBatchSize, writeBatchTimeout, sinkRetryCount, sinkRetryWait, maxConcurrentConnections, disableMetricsCollection, additionalProperties)
         {
             WriteBehavior = writeBehavior;
             HttpRequestTimeout = httpRequestTimeout;
diff --git a/src/AzureDataFactory.TestingFramework/Generated/Models/SapCloudForCustomerSource.Serialization.cs b/src/AzureDataFactory.TestingFramework/Generated/Models/SapCloudForCustomerSource.Serialization.cs
index 83369025..3948161b 100644
--- a/src/AzureDataFactory.TestingFramework/Generated/Models/SapCloudForCustomerSource.Serialization.cs
+++ b/src/AzureDataFactory.TestingFramework/Generated/Models/SapCloudForCustomerSource.Serialization.cs
@@ -89,8 +89,8 @@ internal static SapCloudForCustomerSource DeserializeSapCloudForCustomerSource(J
             Optional<DataFactoryElement<string>> sourceRetryWait = default;
             Optional<DataFactoryElement<int>> maxConcurrentConnections = default;
             Optional<DataFactoryElement<bool>> disableMetricsCollection = default;
-            IDictionary<string, BinaryData> additionalProperties = default;
-            Dictionary<string, BinaryData> additionalPropertiesDictionary = new Dictionary<string, BinaryData>();
+            IDictionary<string, DataFactoryElement<string>> additionalProperties = default;
+            Dictionary<string, DataFactoryElement<string>> additionalPropertiesDictionary = new Dictionary<string, DataFactoryElement<string>>();
             foreach (var property in element.EnumerateObject())
             {
                 if (property.NameEquals("query"u8))
@@ -170,7 +170,7 @@ internal static SapCloudForCustomerSource DeserializeSapCloudForCustomerSource(J
                     disableMetricsCollection = JsonSerializer.Deserialize<DataFactoryElement<bool>>(property.Value.GetRawText());
                     continue;
                 }
-                additionalPropertiesDictionary.Add(property.Name, BinaryData.FromString(property.Value.GetRawText()));
+                additionalPropertiesDictionary.Add(property.Name, JsonSerializer.Deserialize<DataFactoryElement<string>>(property.Value.GetRawText()));
             }
             additionalProperties = additionalPropertiesDictionary;
             return new SapCloudForCustomerSource(type, sourceRetryCount.Value, sourceRetryWait.Value, maxConcurrentConnections.Value, disableMetricsCollection.Value, additionalProperties, queryTimeout.Value, additionalColumns.Value, query.Value, httpRequestTimeout.Value);
diff --git a/src/AzureDataFactory.TestingFramework/Generated/Models/SapCloudForCustomerSource.cs b/src/AzureDataFactory.TestingFramework/Generated/Models/SapCloudForCustomerSource.cs
index 8d14ece8..8f0c6d06 100644
--- a/src/AzureDataFactory.TestingFramework/Generated/Models/SapCloudForCustomerSource.cs
+++ b/src/AzureDataFactory.TestingFramework/Generated/Models/SapCloudForCustomerSource.cs
@@ -29,7 +29,7 @@ public SapCloudForCustomerSource()
         /// <param name="additionalColumns"> Specifies the additional columns to be added to source data. Type: array of objects(AdditionalColumns) (or Expression with resultType array of objects). </param>
         /// <param name="query"> SAP Cloud for Customer OData query. For example, "$top=1". Type: string (or Expression with resultType string). </param>
         /// <param name="httpRequestTimeout"> The timeout (TimeSpan) to get an HTTP response. It is the timeout to get a response, not the timeout to read response data. Default value: 00:05:00. Type: string (or Expression with resultType string), pattern: ((\d+)\.)?(\d\d):(60|([0-5][0-9])):(60|([0-5][0-9])). </param>
-        internal SapCloudForCustomerSource(string copySourceType, DataFactoryElement<int> sourceRetryCount, DataFactoryElement<string> sourceRetryWait, DataFactoryElement<int> maxConcurrentConnections, DataFactoryElement<bool> disableMetricsCollection, IDictionary<string, BinaryData> additionalProperties, DataFactoryElement<string> queryTimeout, BinaryData additionalColumns, DataFactoryElement<string> query, DataFactoryElement<string> httpRequestTimeout) : base(copySourceType, sourceRetryCount, sourceRetryWait, maxConcurrentConnections, disableMetricsCollection, additionalProperties, queryTimeout, additionalColumns)
+        internal SapCloudForCustomerSource(string copySourceType, DataFactoryElement<int> sourceRetryCount, DataFactoryElement<string> sourceRetryWait, DataFactoryElement<int> maxConcurrentConnections, DataFactoryElement<bool> disableMetricsCollection, IDictionary<string, DataFactoryElement<string>> additionalProperties, DataFactoryElement<string> queryTimeout, BinaryData additionalColumns, DataFactoryElement<string> query, DataFactoryElement<string> httpRequestTimeout) : base(copySourceType, sourceRetryCount, sourceRetryWait, maxConcurrentConnections, disableMetricsCollection, additionalProperties, queryTimeout, additionalColumns)
         {
             Query = query;
             HttpRequestTimeout = httpRequestTimeout;
diff --git a/src/AzureDataFactory.TestingFramework/Generated/Models/SapEccLinkedService.Serialization.cs b/src/AzureDataFactory.TestingFramework/Generated/Models/SapEccLinkedService.Serialization.cs
index ba9dbc77..6ddcfefe 100644
--- a/src/AzureDataFactory.TestingFramework/Generated/Models/SapEccLinkedService.Serialization.cs
+++ b/src/AzureDataFactory.TestingFramework/Generated/Models/SapEccLinkedService.Serialization.cs
@@ -105,8 +105,8 @@ internal static SapEccLinkedService DeserializeSapEccLinkedService(JsonElement e
             Optional<DataFactoryElement<string>> username = default;
             Optional<DataFactorySecretBaseDefinition> password = default;
             Optional<string> encryptedCredential = default;
-            IDictionary<string, BinaryData> additionalProperties = default;
-            Dictionary<string, BinaryData> additionalPropertiesDictionary = new Dictionary<string, BinaryData>();
+            IDictionary<string, DataFactoryElement<string>> additionalProperties = default;
+            Dictionary<string, DataFactoryElement<string>> additionalPropertiesDictionary = new Dictionary<string, DataFactoryElement<string>>();
             foreach (var property in element.EnumerateObject())
             {
                 if (property.NameEquals("type"u8))
@@ -203,7 +203,7 @@ internal static SapEccLinkedService DeserializeSapEccLinkedService(JsonElement e
                     }
                     continue;
                 }
-                additionalPropertiesDictionary.Add(property.Name, BinaryData.FromString(property.Value.GetRawText()));
+                additionalPropertiesDictionary.Add(property.Name, JsonSerializer.Deserialize<DataFactoryElement<string>>(property.Value.GetRawText()));
             }
             additionalProperties = additionalPropertiesDictionary;
             return new SapEccLinkedService(type, connectVia.Value, description.Value, Optional.ToDictionary(parameters), Optional.ToList(annotations), additionalProperties, url, username.Value, password, encryptedCredential.Value);
diff --git a/src/AzureDataFactory.TestingFramework/Generated/Models/SapEccLinkedService.cs b/src/AzureDataFactory.TestingFramework/Generated/Models/SapEccLinkedService.cs
index edc03ada..d03cf1fd 100644
--- a/src/AzureDataFactory.TestingFramework/Generated/Models/SapEccLinkedService.cs
+++ b/src/AzureDataFactory.TestingFramework/Generated/Models/SapEccLinkedService.cs
@@ -35,7 +35,7 @@ public SapEccLinkedService(DataFactoryElement<string> uri)
         /// <param name="username"> The username for Basic authentication. Type: string (or Expression with resultType string). </param>
         /// <param name="password"> The password for Basic authentication. </param>
         /// <param name="encryptedCredential"> The encrypted credential used for authentication. Credentials are encrypted using the integration runtime credential manager. Either encryptedCredential or username/password must be provided. Type: string. </param>
-        internal SapEccLinkedService(string linkedServiceType, IntegrationRuntimeReference connectVia, string description, IDictionary<string, EntityParameterSpecification> parameters, IList<BinaryData> annotations, IDictionary<string, BinaryData> additionalProperties, DataFactoryElement<string> uri, DataFactoryElement<string> username, DataFactorySecretBaseDefinition password, string encryptedCredential) : base(linkedServiceType, connectVia, description, parameters, annotations, additionalProperties)
+        internal SapEccLinkedService(string linkedServiceType, IntegrationRuntimeReference connectVia, string description, IDictionary<string, EntityParameterSpecification> parameters, IList<BinaryData> annotations, IDictionary<string, DataFactoryElement<string>> additionalProperties, DataFactoryElement<string> uri, DataFactoryElement<string> username, DataFactorySecretBaseDefinition password, string encryptedCredential) : base(linkedServiceType, connectVia, description, parameters, annotations, additionalProperties)
         {
             Uri = uri;
             Username = username;
diff --git a/src/AzureDataFactory.TestingFramework/Generated/Models/SapEccResourceDataset.Serialization.cs b/src/AzureDataFactory.TestingFramework/Generated/Models/SapEccResourceDataset.Serialization.cs
index ae899c72..bf2b954f 100644
--- a/src/AzureDataFactory.TestingFramework/Generated/Models/SapEccResourceDataset.Serialization.cs
+++ b/src/AzureDataFactory.TestingFramework/Generated/Models/SapEccResourceDataset.Serialization.cs
@@ -101,8 +101,8 @@ internal static SapEccResourceDataset DeserializeSapEccResourceDataset(JsonEleme
             Optional<IList<BinaryData>> annotations = default;
             Optional<DatasetFolder> folder = default;
             DataFactoryElement<string> path = default;
-            IDictionary<string, BinaryData> additionalProperties = default;
-            Dictionary<string, BinaryData> additionalPropertiesDictionary = new Dictionary<string, BinaryData>();
+            IDictionary<string, DataFactoryElement<string>> additionalProperties = default;
+            Dictionary<string, DataFactoryElement<string>> additionalPropertiesDictionary = new Dictionary<string, DataFactoryElement<string>>();
             foreach (var property in element.EnumerateObject())
             {
                 if (property.NameEquals("type"u8))
@@ -199,7 +199,7 @@ internal static SapEccResourceDataset DeserializeSapEccResourceDataset(JsonEleme
                     }
                     continue;
                 }
-                additionalPropertiesDictionary.Add(property.Name, BinaryData.FromString(property.Value.GetRawText()));
+                additionalPropertiesDictionary.Add(property.Name, JsonSerializer.Deserialize<DataFactoryElement<string>>(property.Value.GetRawText()));
             }
             additionalProperties = additionalPropertiesDictionary;
             return new SapEccResourceDataset(type, description.Value, structure.Value, schema.Value, linkedServiceName, Optional.ToDictionary(parameters), Optional.ToList(annotations), folder.Value, additionalProperties, path);
diff --git a/src/AzureDataFactory.TestingFramework/Generated/Models/SapEccResourceDataset.cs b/src/AzureDataFactory.TestingFramework/Generated/Models/SapEccResourceDataset.cs
index a69a70e2..62530ae9 100644
--- a/src/AzureDataFactory.TestingFramework/Generated/Models/SapEccResourceDataset.cs
+++ b/src/AzureDataFactory.TestingFramework/Generated/Models/SapEccResourceDataset.cs
@@ -37,7 +37,7 @@ public SapEccResourceDataset(DataFactoryLinkedServiceReference linkedServiceName
         /// <param name="folder"> The folder that this Dataset is in. If not specified, Dataset will appear at the root level. </param>
         /// <param name="additionalProperties"> Additional Properties. </param>
         /// <param name="path"> The path of the SAP ECC OData entity. Type: string (or Expression with resultType string). </param>
-        internal SapEccResourceDataset(string datasetType, string description, DataFactoryElement<IList<DatasetDataElement>> structure, DataFactoryElement<IList<DatasetSchemaDataElement>> schema, DataFactoryLinkedServiceReference linkedServiceName, IDictionary<string, EntityParameterSpecification> parameters, IList<BinaryData> annotations, DatasetFolder folder, IDictionary<string, BinaryData> additionalProperties, DataFactoryElement<string> path) : base(datasetType, description, structure, schema, linkedServiceName, parameters, annotations, folder, additionalProperties)
+        internal SapEccResourceDataset(string datasetType, string description, DataFactoryElement<IList<DatasetDataElement>> structure, DataFactoryElement<IList<DatasetSchemaDataElement>> schema, DataFactoryLinkedServiceReference linkedServiceName, IDictionary<string, EntityParameterSpecification> parameters, IList<BinaryData> annotations, DatasetFolder folder, IDictionary<string, DataFactoryElement<string>> additionalProperties, DataFactoryElement<string> path) : base(datasetType, description, structure, schema, linkedServiceName, parameters, annotations, folder, additionalProperties)
         {
             Path = path;
             DatasetType = datasetType ?? "SapEccResource";
diff --git a/src/AzureDataFactory.TestingFramework/Generated/Models/SapEccSource.Serialization.cs b/src/AzureDataFactory.TestingFramework/Generated/Models/SapEccSource.Serialization.cs
index 4af96af4..34b8fb7e 100644
--- a/src/AzureDataFactory.TestingFramework/Generated/Models/SapEccSource.Serialization.cs
+++ b/src/AzureDataFactory.TestingFramework/Generated/Models/SapEccSource.Serialization.cs
@@ -89,8 +89,8 @@ internal static SapEccSource DeserializeSapEccSource(JsonElement element)
             Optional<DataFactoryElement<string>> sourceRetryWait = default;
             Optional<DataFactoryElement<int>> maxConcurrentConnections = default;
             Optional<DataFactoryElement<bool>> disableMetricsCollection = default;
-            IDictionary<string, BinaryData> additionalProperties = default;
-            Dictionary<string, BinaryData> additionalPropertiesDictionary = new Dictionary<string, BinaryData>();
+            IDictionary<string, DataFactoryElement<string>> additionalProperties = default;
+            Dictionary<string, DataFactoryElement<string>> additionalPropertiesDictionary = new Dictionary<string, DataFactoryElement<string>>();
             foreach (var property in element.EnumerateObject())
             {
                 if (property.NameEquals("query"u8))
@@ -170,7 +170,7 @@ internal static SapEccSource DeserializeSapEccSource(JsonElement element)
                     disableMetricsCollection = JsonSerializer.Deserialize<DataFactoryElement<bool>>(property.Value.GetRawText());
                     continue;
                 }
-                additionalPropertiesDictionary.Add(property.Name, BinaryData.FromString(property.Value.GetRawText()));
+                additionalPropertiesDictionary.Add(property.Name, JsonSerializer.Deserialize<DataFactoryElement<string>>(property.Value.GetRawText()));
             }
             additionalProperties = additionalPropertiesDictionary;
             return new SapEccSource(type, sourceRetryCount.Value, sourceRetryWait.Value, maxConcurrentConnections.Value, disableMetricsCollection.Value, additionalProperties, queryTimeout.Value, additionalColumns.Value, query.Value, httpRequestTimeout.Value);
diff --git a/src/AzureDataFactory.TestingFramework/Generated/Models/SapEccSource.cs b/src/AzureDataFactory.TestingFramework/Generated/Models/SapEccSource.cs
index 63f30859..94731c4d 100644
--- a/src/AzureDataFactory.TestingFramework/Generated/Models/SapEccSource.cs
+++ b/src/AzureDataFactory.TestingFramework/Generated/Models/SapEccSource.cs
@@ -29,7 +29,7 @@ public SapEccSource()
         /// <param name="additionalColumns"> Specifies the additional columns to be added to source data. Type: array of objects(AdditionalColumns) (or Expression with resultType array of objects). </param>
         /// <param name="query"> SAP ECC OData query. For example, "$top=1". Type: string (or Expression with resultType string). </param>
         /// <param name="httpRequestTimeout"> The timeout (TimeSpan) to get an HTTP response. It is the timeout to get a response, not the timeout to read response data. Default value: 00:05:00. Type: string (or Expression with resultType string), pattern: ((\d+)\.)?(\d\d):(60|([0-5][0-9])):(60|([0-5][0-9])). </param>
-        internal SapEccSource(string copySourceType, DataFactoryElement<int> sourceRetryCount, DataFactoryElement<string> sourceRetryWait, DataFactoryElement<int> maxConcurrentConnections, DataFactoryElement<bool> disableMetricsCollection, IDictionary<string, BinaryData> additionalProperties, DataFactoryElement<string> queryTimeout, BinaryData additionalColumns, DataFactoryElement<string> query, DataFactoryElement<string> httpRequestTimeout) : base(copySourceType, sourceRetryCount, sourceRetryWait, maxConcurrentConnections, disableMetricsCollection, additionalProperties, queryTimeout, additionalColumns)
+        internal SapEccSource(string copySourceType, DataFactoryElement<int> sourceRetryCount, DataFactoryElement<string> sourceRetryWait, DataFactoryElement<int> maxConcurrentConnections, DataFactoryElement<bool> disableMetricsCollection, IDictionary<string, DataFactoryElement<string>> additionalProperties, DataFactoryElement<string> queryTimeout, BinaryData additionalColumns, DataFactoryElement<string> query, DataFactoryElement<string> httpRequestTimeout) : base(copySourceType, sourceRetryCount, sourceRetryWait, maxConcurrentConnections, disableMetricsCollection, additionalProperties, queryTimeout, additionalColumns)
         {
             Query = query;
             HttpRequestTimeout = httpRequestTimeout;
diff --git a/src/AzureDataFactory.TestingFramework/Generated/Models/SapHanaLinkedService.Serialization.cs b/src/AzureDataFactory.TestingFramework/Generated/Models/SapHanaLinkedService.Serialization.cs
index 29b1ce2c..776745c1 100644
--- a/src/AzureDataFactory.TestingFramework/Generated/Models/SapHanaLinkedService.Serialization.cs
+++ b/src/AzureDataFactory.TestingFramework/Generated/Models/SapHanaLinkedService.Serialization.cs
@@ -120,8 +120,8 @@ internal static SapHanaLinkedService DeserializeSapHanaLinkedService(JsonElement
             Optional<DataFactoryElement<string>> userName = default;
             Optional<DataFactorySecretBaseDefinition> password = default;
             Optional<string> encryptedCredential = default;
-            IDictionary<string, BinaryData> additionalProperties = default;
-            Dictionary<string, BinaryData> additionalPropertiesDictionary = new Dictionary<string, BinaryData>();
+            IDictionary<string, DataFactoryElement<string>> additionalProperties = default;
+            Dictionary<string, DataFactoryElement<string>> additionalPropertiesDictionary = new Dictionary<string, DataFactoryElement<string>>();
             foreach (var property in element.EnumerateObject())
             {
                 if (property.NameEquals("type"u8))
@@ -240,7 +240,7 @@ internal static SapHanaLinkedService DeserializeSapHanaLinkedService(JsonElement
                     }
                     continue;
                 }
-                additionalPropertiesDictionary.Add(property.Name, BinaryData.FromString(property.Value.GetRawText()));
+                additionalPropertiesDictionary.Add(property.Name, JsonSerializer.Deserialize<DataFactoryElement<string>>(property.Value.GetRawText()));
             }
             additionalProperties = additionalPropertiesDictionary;
             return new SapHanaLinkedService(type, connectVia.Value, description.Value, Optional.ToDictionary(parameters), Optional.ToList(annotations), additionalProperties, connectionString.Value, server.Value, Optional.ToNullable(authenticationType), userName.Value, password, encryptedCredential.Value);
diff --git a/src/AzureDataFactory.TestingFramework/Generated/Models/SapHanaLinkedService.cs b/src/AzureDataFactory.TestingFramework/Generated/Models/SapHanaLinkedService.cs
index 3a175474..1043a456 100644
--- a/src/AzureDataFactory.TestingFramework/Generated/Models/SapHanaLinkedService.cs
+++ b/src/AzureDataFactory.TestingFramework/Generated/Models/SapHanaLinkedService.cs
@@ -31,7 +31,7 @@ public SapHanaLinkedService()
         /// <param name="userName"> Username to access the SAP HANA server. Type: string (or Expression with resultType string). </param>
         /// <param name="password"> Password to access the SAP HANA server. </param>
         /// <param name="encryptedCredential"> The encrypted credential used for authentication. Credentials are encrypted using the integration runtime credential manager. Type: string. </param>
-        internal SapHanaLinkedService(string linkedServiceType, IntegrationRuntimeReference connectVia, string description, IDictionary<string, EntityParameterSpecification> parameters, IList<BinaryData> annotations, IDictionary<string, BinaryData> additionalProperties, DataFactoryElement<string> connectionString, DataFactoryElement<string> server, SapHanaAuthenticationType? authenticationType, DataFactoryElement<string> userName, DataFactorySecretBaseDefinition password, string encryptedCredential) : base(linkedServiceType, connectVia, description, parameters, annotations, additionalProperties)
+        internal SapHanaLinkedService(string linkedServiceType, IntegrationRuntimeReference connectVia, string description, IDictionary<string, EntityParameterSpecification> parameters, IList<BinaryData> annotations, IDictionary<string, DataFactoryElement<string>> additionalProperties, DataFactoryElement<string> connectionString, DataFactoryElement<string> server, SapHanaAuthenticationType? authenticationType, DataFactoryElement<string> userName, DataFactorySecretBaseDefinition password, string encryptedCredential) : base(linkedServiceType, connectVia, description, parameters, annotations, additionalProperties)
         {
             ConnectionString = connectionString;
             Server = server;
diff --git a/src/AzureDataFactory.TestingFramework/Generated/Models/SapHanaSource.Serialization.cs b/src/AzureDataFactory.TestingFramework/Generated/Models/SapHanaSource.Serialization.cs
index c3d2a572..c337e771 100644
--- a/src/AzureDataFactory.TestingFramework/Generated/Models/SapHanaSource.Serialization.cs
+++ b/src/AzureDataFactory.TestingFramework/Generated/Models/SapHanaSource.Serialization.cs
@@ -105,8 +105,8 @@ internal static SapHanaSource DeserializeSapHanaSource(JsonElement element)
             Optional<DataFactoryElement<string>> sourceRetryWait = default;
             Optional<DataFactoryElement<int>> maxConcurrentConnections = default;
             Optional<DataFactoryElement<bool>> disableMetricsCollection = default;
-            IDictionary<string, BinaryData> additionalProperties = default;
-            Dictionary<string, BinaryData> additionalPropertiesDictionary = new Dictionary<string, BinaryData>();
+            IDictionary<string, DataFactoryElement<string>> additionalProperties = default;
+            Dictionary<string, DataFactoryElement<string>> additionalPropertiesDictionary = new Dictionary<string, DataFactoryElement<string>>();
             foreach (var property in element.EnumerateObject())
             {
                 if (property.NameEquals("query"u8))
@@ -204,7 +204,7 @@ internal static SapHanaSource DeserializeSapHanaSource(JsonElement element)
                     disableMetricsCollection = JsonSerializer.Deserialize<DataFactoryElement<bool>>(property.Value.GetRawText());
                     continue;
                 }
-                additionalPropertiesDictionary.Add(property.Name, BinaryData.FromString(property.Value.GetRawText()));
+                additionalPropertiesDictionary.Add(property.Name, JsonSerializer.Deserialize<DataFactoryElement<string>>(property.Value.GetRawText()));
             }
             additionalProperties = additionalPropertiesDictionary;
             return new SapHanaSource(type, sourceRetryCount.Value, sourceRetryWait.Value, maxConcurrentConnections.Value, disableMetricsCollection.Value, additionalProperties, queryTimeout.Value, additionalColumns.Value, query.Value, packetSize.Value, partitionOption.Value, partitionSettings.Value);
diff --git a/src/AzureDataFactory.TestingFramework/Generated/Models/SapHanaSource.cs b/src/AzureDataFactory.TestingFramework/Generated/Models/SapHanaSource.cs
index 4d0e5881..69ca2f1a 100644
--- a/src/AzureDataFactory.TestingFramework/Generated/Models/SapHanaSource.cs
+++ b/src/AzureDataFactory.TestingFramework/Generated/Models/SapHanaSource.cs
@@ -31,7 +31,7 @@ public SapHanaSource()
         /// <param name="packetSize"> The packet size of data read from SAP HANA. Type: integer(or Expression with resultType integer). </param>
         /// <param name="partitionOption"> The partition mechanism that will be used for SAP HANA read in parallel. Possible values include: "None", "PhysicalPartitionsOfTable", "SapHanaDynamicRange". </param>
         /// <param name="partitionSettings"> The settings that will be leveraged for SAP HANA source partitioning. </param>
-        internal SapHanaSource(string copySourceType, DataFactoryElement<int> sourceRetryCount, DataFactoryElement<string> sourceRetryWait, DataFactoryElement<int> maxConcurrentConnections, DataFactoryElement<bool> disableMetricsCollection, IDictionary<string, BinaryData> additionalProperties, DataFactoryElement<string> queryTimeout, BinaryData additionalColumns, DataFactoryElement<string> query, DataFactoryElement<int> packetSize, BinaryData partitionOption, SapHanaPartitionSettings partitionSettings) : base(copySourceType, sourceRetryCount, sourceRetryWait, maxConcurrentConnections, disableMetricsCollection, additionalProperties, queryTimeout, additionalColumns)
+        internal SapHanaSource(string copySourceType, DataFactoryElement<int> sourceRetryCount, DataFactoryElement<string> sourceRetryWait, DataFactoryElement<int> maxConcurrentConnections, DataFactoryElement<bool> disableMetricsCollection, IDictionary<string, DataFactoryElement<string>> additionalProperties, DataFactoryElement<string> queryTimeout, BinaryData additionalColumns, DataFactoryElement<string> query, DataFactoryElement<int> packetSize, BinaryData partitionOption, SapHanaPartitionSettings partitionSettings) : base(copySourceType, sourceRetryCount, sourceRetryWait, maxConcurrentConnections, disableMetricsCollection, additionalProperties, queryTimeout, additionalColumns)
         {
             Query = query;
             PacketSize = packetSize;
diff --git a/src/AzureDataFactory.TestingFramework/Generated/Models/SapHanaTableDataset.Serialization.cs b/src/AzureDataFactory.TestingFramework/Generated/Models/SapHanaTableDataset.Serialization.cs
index 65c1152b..c41ddd51 100644
--- a/src/AzureDataFactory.TestingFramework/Generated/Models/SapHanaTableDataset.Serialization.cs
+++ b/src/AzureDataFactory.TestingFramework/Generated/Models/SapHanaTableDataset.Serialization.cs
@@ -110,8 +110,8 @@ internal static SapHanaTableDataset DeserializeSapHanaTableDataset(JsonElement e
             Optional<DatasetFolder> folder = default;
             Optional<DataFactoryElement<string>> schema0 = default;
             Optional<DataFactoryElement<string>> table = default;
-            IDictionary<string, BinaryData> additionalProperties = default;
-            Dictionary<string, BinaryData> additionalPropertiesDictionary = new Dictionary<string, BinaryData>();
+            IDictionary<string, DataFactoryElement<string>> additionalProperties = default;
+            Dictionary<string, DataFactoryElement<string>> additionalPropertiesDictionary = new Dictionary<string, DataFactoryElement<string>>();
             foreach (var property in element.EnumerateObject())
             {
                 if (property.NameEquals("type"u8))
@@ -221,7 +221,7 @@ internal static SapHanaTableDataset DeserializeSapHanaTableDataset(JsonElement e
                     }
                     continue;
                 }
-                additionalPropertiesDictionary.Add(property.Name, BinaryData.FromString(property.Value.GetRawText()));
+                additionalPropertiesDictionary.Add(property.Name, JsonSerializer.Deserialize<DataFactoryElement<string>>(property.Value.GetRawText()));
             }
             additionalProperties = additionalPropertiesDictionary;
             return new SapHanaTableDataset(type, description.Value, structure.Value, schema.Value, linkedServiceName, Optional.ToDictionary(parameters), Optional.ToList(annotations), folder.Value, additionalProperties, schema0.Value, table.Value);
diff --git a/src/AzureDataFactory.TestingFramework/Generated/Models/SapHanaTableDataset.cs b/src/AzureDataFactory.TestingFramework/Generated/Models/SapHanaTableDataset.cs
index c0a0e591..ff414192 100644
--- a/src/AzureDataFactory.TestingFramework/Generated/Models/SapHanaTableDataset.cs
+++ b/src/AzureDataFactory.TestingFramework/Generated/Models/SapHanaTableDataset.cs
@@ -35,7 +35,7 @@ public SapHanaTableDataset(DataFactoryLinkedServiceReference linkedServiceName)
         /// <param name="additionalProperties"> Additional Properties. </param>
         /// <param name="schemaTypePropertiesSchema"> The schema name of SAP HANA. Type: string (or Expression with resultType string). </param>
         /// <param name="table"> The table name of SAP HANA. Type: string (or Expression with resultType string). </param>
-        internal SapHanaTableDataset(string datasetType, string description, DataFactoryElement<IList<DatasetDataElement>> structure, DataFactoryElement<IList<DatasetSchemaDataElement>> schema, DataFactoryLinkedServiceReference linkedServiceName, IDictionary<string, EntityParameterSpecification> parameters, IList<BinaryData> annotations, DatasetFolder folder, IDictionary<string, BinaryData> additionalProperties, DataFactoryElement<string> schemaTypePropertiesSchema, DataFactoryElement<string> table) : base(datasetType, description, structure, schema, linkedServiceName, parameters, annotations, folder, additionalProperties)
+        internal SapHanaTableDataset(string datasetType, string description, DataFactoryElement<IList<DatasetDataElement>> structure, DataFactoryElement<IList<DatasetSchemaDataElement>> schema, DataFactoryLinkedServiceReference linkedServiceName, IDictionary<string, EntityParameterSpecification> parameters, IList<BinaryData> annotations, DatasetFolder folder, IDictionary<string, DataFactoryElement<string>> additionalProperties, DataFactoryElement<string> schemaTypePropertiesSchema, DataFactoryElement<string> table) : base(datasetType, description, structure, schema, linkedServiceName, parameters, annotations, folder, additionalProperties)
         {
             SchemaTypePropertiesSchema = schemaTypePropertiesSchema;
             Table = table;
diff --git a/src/AzureDataFactory.TestingFramework/Generated/Models/SapOdpLinkedService.Serialization.cs b/src/AzureDataFactory.TestingFramework/Generated/Models/SapOdpLinkedService.Serialization.cs
index cce1ca7c..d5289206 100644
--- a/src/AzureDataFactory.TestingFramework/Generated/Models/SapOdpLinkedService.Serialization.cs
+++ b/src/AzureDataFactory.TestingFramework/Generated/Models/SapOdpLinkedService.Serialization.cs
@@ -192,8 +192,8 @@ internal static SapOdpLinkedService DeserializeSapOdpLinkedService(JsonElement e
             Optional<DataFactoryElement<string>> logonGroup = default;
             Optional<DataFactoryElement<string>> subscriberName = default;
             Optional<string> encryptedCredential = default;
-            IDictionary<string, BinaryData> additionalProperties = default;
-            Dictionary<string, BinaryData> additionalPropertiesDictionary = new Dictionary<string, BinaryData>();
+            IDictionary<string, DataFactoryElement<string>> additionalProperties = default;
+            Dictionary<string, DataFactoryElement<string>> additionalPropertiesDictionary = new Dictionary<string, DataFactoryElement<string>>();
             foreach (var property in element.EnumerateObject())
             {
                 if (property.NameEquals("type"u8))
@@ -420,7 +420,7 @@ internal static SapOdpLinkedService DeserializeSapOdpLinkedService(JsonElement e
                     }
                     continue;
                 }
-                additionalPropertiesDictionary.Add(property.Name, BinaryData.FromString(property.Value.GetRawText()));
+                additionalPropertiesDictionary.Add(property.Name, JsonSerializer.Deserialize<DataFactoryElement<string>>(property.Value.GetRawText()));
             }
             additionalProperties = additionalPropertiesDictionary;
             return new SapOdpLinkedService(type, connectVia.Value, description.Value, Optional.ToDictionary(parameters), Optional.ToList(annotations), additionalProperties, server.Value, systemNumber.Value, clientId.Value, language.Value, systemId.Value, userName.Value, password, messageServer.Value, messageServerService.Value, sncMode.Value, sncMyName.Value, sncPartnerName.Value, sncLibraryPath.Value, sncQop.Value, x509CertificatePath.Value, logonGroup.Value, subscriberName.Value, encryptedCredential.Value);
diff --git a/src/AzureDataFactory.TestingFramework/Generated/Models/SapOdpLinkedService.cs b/src/AzureDataFactory.TestingFramework/Generated/Models/SapOdpLinkedService.cs
index 1207df16..4e7c92e7 100644
--- a/src/AzureDataFactory.TestingFramework/Generated/Models/SapOdpLinkedService.cs
+++ b/src/AzureDataFactory.TestingFramework/Generated/Models/SapOdpLinkedService.cs
@@ -43,7 +43,7 @@ public SapOdpLinkedService()
         /// <param name="logonGroup"> The Logon Group for the SAP System. Type: string (or Expression with resultType string). </param>
         /// <param name="subscriberName"> The subscriber name. Type: string (or Expression with resultType string). </param>
         /// <param name="encryptedCredential"> The encrypted credential used for authentication. Credentials are encrypted using the integration runtime credential manager. Type: string. </param>
-        internal SapOdpLinkedService(string linkedServiceType, IntegrationRuntimeReference connectVia, string description, IDictionary<string, EntityParameterSpecification> parameters, IList<BinaryData> annotations, IDictionary<string, BinaryData> additionalProperties, DataFactoryElement<string> server, DataFactoryElement<string> systemNumber, DataFactoryElement<string> clientId, DataFactoryElement<string> language, DataFactoryElement<string> systemId, DataFactoryElement<string> userName, DataFactorySecretBaseDefinition password, DataFactoryElement<string> messageServer, DataFactoryElement<string> messageServerService, DataFactoryElement<string> sncMode, DataFactoryElement<string> sncMyName, DataFactoryElement<string> sncPartnerName, DataFactoryElement<string> sncLibraryPath, DataFactoryElement<string> sncQop, DataFactoryElement<string> x509CertificatePath, DataFactoryElement<string> logonGroup, DataFactoryElement<string> subscriberName, string encryptedCredential) : base(linkedServiceType, connectVia, description, parameters, annotations, additionalProperties)
+        internal SapOdpLinkedService(string linkedServiceType, IntegrationRuntimeReference connectVia, string description, IDictionary<string, EntityParameterSpecification> parameters, IList<BinaryData> annotations, IDictionary<string, DataFactoryElement<string>> additionalProperties, DataFactoryElement<string> server, DataFactoryElement<string> systemNumber, DataFactoryElement<string> clientId, DataFactoryElement<string> language, DataFactoryElement<string> systemId, DataFactoryElement<string> userName, DataFactorySecretBaseDefinition password, DataFactoryElement<string> messageServer, DataFactoryElement<string> messageServerService, DataFactoryElement<string> sncMode, DataFactoryElement<string> sncMyName, DataFactoryElement<string> sncPartnerName, DataFactoryElement<string> sncLibraryPath, DataFactoryElement<string> sncQop, DataFactoryElement<string> x509CertificatePath, DataFactoryElement<string> logonGroup, DataFactoryElement<string> subscriberName, string encryptedCredential) : base(linkedServiceType, connectVia, description, parameters, annotations, additionalProperties)
         {
             Server = server;
             SystemNumber = systemNumber;
diff --git a/src/AzureDataFactory.TestingFramework/Generated/Models/SapOdpResourceDataset.Serialization.cs b/src/AzureDataFactory.TestingFramework/Generated/Models/SapOdpResourceDataset.Serialization.cs
index e19dca35..6b4017d2 100644
--- a/src/AzureDataFactory.TestingFramework/Generated/Models/SapOdpResourceDataset.Serialization.cs
+++ b/src/AzureDataFactory.TestingFramework/Generated/Models/SapOdpResourceDataset.Serialization.cs
@@ -104,8 +104,8 @@ internal static SapOdpResourceDataset DeserializeSapOdpResourceDataset(JsonEleme
             Optional<DatasetFolder> folder = default;
             DataFactoryElement<string> context = default;
             DataFactoryElement<string> objectName = default;
-            IDictionary<string, BinaryData> additionalProperties = default;
-            Dictionary<string, BinaryData> additionalPropertiesDictionary = new Dictionary<string, BinaryData>();
+            IDictionary<string, DataFactoryElement<string>> additionalProperties = default;
+            Dictionary<string, DataFactoryElement<string>> additionalPropertiesDictionary = new Dictionary<string, DataFactoryElement<string>>();
             foreach (var property in element.EnumerateObject())
             {
                 if (property.NameEquals("type"u8))
@@ -207,7 +207,7 @@ internal static SapOdpResourceDataset DeserializeSapOdpResourceDataset(JsonEleme
                     }
                     continue;
                 }
-                additionalPropertiesDictionary.Add(property.Name, BinaryData.FromString(property.Value.GetRawText()));
+                additionalPropertiesDictionary.Add(property.Name, JsonSerializer.Deserialize<DataFactoryElement<string>>(property.Value.GetRawText()));
             }
             additionalProperties = additionalPropertiesDictionary;
             return new SapOdpResourceDataset(type, description.Value, structure.Value, schema.Value, linkedServiceName, Optional.ToDictionary(parameters), Optional.ToList(annotations), folder.Value, additionalProperties, context, objectName);
diff --git a/src/AzureDataFactory.TestingFramework/Generated/Models/SapOdpResourceDataset.cs b/src/AzureDataFactory.TestingFramework/Generated/Models/SapOdpResourceDataset.cs
index b1890767..455f6c63 100644
--- a/src/AzureDataFactory.TestingFramework/Generated/Models/SapOdpResourceDataset.cs
+++ b/src/AzureDataFactory.TestingFramework/Generated/Models/SapOdpResourceDataset.cs
@@ -41,7 +41,7 @@ public SapOdpResourceDataset(DataFactoryLinkedServiceReference linkedServiceName
         /// <param name="additionalProperties"> Additional Properties. </param>
         /// <param name="context"> The context of the SAP ODP Object. Type: string (or Expression with resultType string). </param>
         /// <param name="objectName"> The name of the SAP ODP Object. Type: string (or Expression with resultType string). </param>
-        internal SapOdpResourceDataset(string datasetType, string description, DataFactoryElement<IList<DatasetDataElement>> structure, DataFactoryElement<IList<DatasetSchemaDataElement>> schema, DataFactoryLinkedServiceReference linkedServiceName, IDictionary<string, EntityParameterSpecification> parameters, IList<BinaryData> annotations, DatasetFolder folder, IDictionary<string, BinaryData> additionalProperties, DataFactoryElement<string> context, DataFactoryElement<string> objectName) : base(datasetType, description, structure, schema, linkedServiceName, parameters, annotations, folder, additionalProperties)
+        internal SapOdpResourceDataset(string datasetType, string description, DataFactoryElement<IList<DatasetDataElement>> structure, DataFactoryElement<IList<DatasetSchemaDataElement>> schema, DataFactoryLinkedServiceReference linkedServiceName, IDictionary<string, EntityParameterSpecification> parameters, IList<BinaryData> annotations, DatasetFolder folder, IDictionary<string, DataFactoryElement<string>> additionalProperties, DataFactoryElement<string> context, DataFactoryElement<string> objectName) : base(datasetType, description, structure, schema, linkedServiceName, parameters, annotations, folder, additionalProperties)
         {
             Context = context;
             ObjectName = objectName;
diff --git a/src/AzureDataFactory.TestingFramework/Generated/Models/SapOdpSource.Serialization.cs b/src/AzureDataFactory.TestingFramework/Generated/Models/SapOdpSource.Serialization.cs
index e2034c46..ed5b078d 100644
--- a/src/AzureDataFactory.TestingFramework/Generated/Models/SapOdpSource.Serialization.cs
+++ b/src/AzureDataFactory.TestingFramework/Generated/Models/SapOdpSource.Serialization.cs
@@ -109,8 +109,8 @@ internal static SapOdpSource DeserializeSapOdpSource(JsonElement element)
             Optional<DataFactoryElement<string>> sourceRetryWait = default;
             Optional<DataFactoryElement<int>> maxConcurrentConnections = default;
             Optional<DataFactoryElement<bool>> disableMetricsCollection = default;
-            IDictionary<string, BinaryData> additionalProperties = default;
-            Dictionary<string, BinaryData> additionalPropertiesDictionary = new Dictionary<string, BinaryData>();
+            IDictionary<string, DataFactoryElement<string>> additionalProperties = default;
+            Dictionary<string, DataFactoryElement<string>> additionalPropertiesDictionary = new Dictionary<string, DataFactoryElement<string>>();
             foreach (var property in element.EnumerateObject())
             {
                 if (property.NameEquals("extractionMode"u8))
@@ -208,7 +208,7 @@ internal static SapOdpSource DeserializeSapOdpSource(JsonElement element)
                     disableMetricsCollection = JsonSerializer.Deserialize<DataFactoryElement<bool>>(property.Value.GetRawText());
                     continue;
                 }
-                additionalPropertiesDictionary.Add(property.Name, BinaryData.FromString(property.Value.GetRawText()));
+                additionalPropertiesDictionary.Add(property.Name, JsonSerializer.Deserialize<DataFactoryElement<string>>(property.Value.GetRawText()));
             }
             additionalProperties = additionalPropertiesDictionary;
             return new SapOdpSource(type, sourceRetryCount.Value, sourceRetryWait.Value, maxConcurrentConnections.Value, disableMetricsCollection.Value, additionalProperties, queryTimeout.Value, additionalColumns.Value, extractionMode.Value, subscriberProcess.Value, selection.Value, projection.Value);
diff --git a/src/AzureDataFactory.TestingFramework/Generated/Models/SapOdpSource.cs b/src/AzureDataFactory.TestingFramework/Generated/Models/SapOdpSource.cs
index 28ec576d..1e1e236c 100644
--- a/src/AzureDataFactory.TestingFramework/Generated/Models/SapOdpSource.cs
+++ b/src/AzureDataFactory.TestingFramework/Generated/Models/SapOdpSource.cs
@@ -31,7 +31,7 @@ public SapOdpSource()
         /// <param name="subscriberProcess"> The subscriber process to manage the delta process. Type: string (or Expression with resultType string). </param>
         /// <param name="selection"> Specifies the selection conditions from source data. Type: array of objects(selection) (or Expression with resultType array of objects). </param>
         /// <param name="projection"> Specifies the columns to be selected from source data. Type: array of objects(projection) (or Expression with resultType array of objects). </param>
-        internal SapOdpSource(string copySourceType, DataFactoryElement<int> sourceRetryCount, DataFactoryElement<string> sourceRetryWait, DataFactoryElement<int> maxConcurrentConnections, DataFactoryElement<bool> disableMetricsCollection, IDictionary<string, BinaryData> additionalProperties, DataFactoryElement<string> queryTimeout, BinaryData additionalColumns, DataFactoryElement<string> extractionMode, DataFactoryElement<string> subscriberProcess, BinaryData selection, BinaryData projection) : base(copySourceType, sourceRetryCount, sourceRetryWait, maxConcurrentConnections, disableMetricsCollection, additionalProperties, queryTimeout, additionalColumns)
+        internal SapOdpSource(string copySourceType, DataFactoryElement<int> sourceRetryCount, DataFactoryElement<string> sourceRetryWait, DataFactoryElement<int> maxConcurrentConnections, DataFactoryElement<bool> disableMetricsCollection, IDictionary<string, DataFactoryElement<string>> additionalProperties, DataFactoryElement<string> queryTimeout, BinaryData additionalColumns, DataFactoryElement<string> extractionMode, DataFactoryElement<string> subscriberProcess, BinaryData selection, BinaryData projection) : base(copySourceType, sourceRetryCount, sourceRetryWait, maxConcurrentConnections, disableMetricsCollection, additionalProperties, queryTimeout, additionalColumns)
         {
             ExtractionMode = extractionMode;
             SubscriberProcess = subscriberProcess;
diff --git a/src/AzureDataFactory.TestingFramework/Generated/Models/SapOpenHubLinkedService.Serialization.cs b/src/AzureDataFactory.TestingFramework/Generated/Models/SapOpenHubLinkedService.Serialization.cs
index 6e48ee48..d3c2d370 100644
--- a/src/AzureDataFactory.TestingFramework/Generated/Models/SapOpenHubLinkedService.Serialization.cs
+++ b/src/AzureDataFactory.TestingFramework/Generated/Models/SapOpenHubLinkedService.Serialization.cs
@@ -150,8 +150,8 @@ internal static SapOpenHubLinkedService DeserializeSapOpenHubLinkedService(JsonE
             Optional<DataFactoryElement<string>> messageServerService = default;
             Optional<DataFactoryElement<string>> logonGroup = default;
             Optional<string> encryptedCredential = default;
-            IDictionary<string, BinaryData> additionalProperties = default;
-            Dictionary<string, BinaryData> additionalPropertiesDictionary = new Dictionary<string, BinaryData>();
+            IDictionary<string, DataFactoryElement<string>> additionalProperties = default;
+            Dictionary<string, DataFactoryElement<string>> additionalPropertiesDictionary = new Dictionary<string, DataFactoryElement<string>>();
             foreach (var property in element.EnumerateObject())
             {
                 if (property.NameEquals("type"u8))
@@ -315,7 +315,7 @@ internal static SapOpenHubLinkedService DeserializeSapOpenHubLinkedService(JsonE
                     }
                     continue;
                 }
-                additionalPropertiesDictionary.Add(property.Name, BinaryData.FromString(property.Value.GetRawText()));
+                additionalPropertiesDictionary.Add(property.Name, JsonSerializer.Deserialize<DataFactoryElement<string>>(property.Value.GetRawText()));
             }
             additionalProperties = additionalPropertiesDictionary;
             return new SapOpenHubLinkedService(type, connectVia.Value, description.Value, Optional.ToDictionary(parameters), Optional.ToList(annotations), additionalProperties, server.Value, systemNumber.Value, clientId.Value, language.Value, systemId.Value, userName.Value, password, messageServer.Value, messageServerService.Value, logonGroup.Value, encryptedCredential.Value);
diff --git a/src/AzureDataFactory.TestingFramework/Generated/Models/SapOpenHubLinkedService.cs b/src/AzureDataFactory.TestingFramework/Generated/Models/SapOpenHubLinkedService.cs
index 85795c9e..944c93cc 100644
--- a/src/AzureDataFactory.TestingFramework/Generated/Models/SapOpenHubLinkedService.cs
+++ b/src/AzureDataFactory.TestingFramework/Generated/Models/SapOpenHubLinkedService.cs
@@ -36,7 +36,7 @@ public SapOpenHubLinkedService()
         /// <param name="messageServerService"> The service name or port number of the Message Server. Type: string (or Expression with resultType string). </param>
         /// <param name="logonGroup"> The Logon Group for the SAP System. Type: string (or Expression with resultType string). </param>
         /// <param name="encryptedCredential"> The encrypted credential used for authentication. Credentials are encrypted using the integration runtime credential manager. Type: string. </param>
-        internal SapOpenHubLinkedService(string linkedServiceType, IntegrationRuntimeReference connectVia, string description, IDictionary<string, EntityParameterSpecification> parameters, IList<BinaryData> annotations, IDictionary<string, BinaryData> additionalProperties, DataFactoryElement<string> server, DataFactoryElement<string> systemNumber, DataFactoryElement<string> clientId, DataFactoryElement<string> language, DataFactoryElement<string> systemId, DataFactoryElement<string> userName, DataFactorySecretBaseDefinition password, DataFactoryElement<string> messageServer, DataFactoryElement<string> messageServerService, DataFactoryElement<string> logonGroup, string encryptedCredential) : base(linkedServiceType, connectVia, description, parameters, annotations, additionalProperties)
+        internal SapOpenHubLinkedService(string linkedServiceType, IntegrationRuntimeReference connectVia, string description, IDictionary<string, EntityParameterSpecification> parameters, IList<BinaryData> annotations, IDictionary<string, DataFactoryElement<string>> additionalProperties, DataFactoryElement<string> server, DataFactoryElement<string> systemNumber, DataFactoryElement<string> clientId, DataFactoryElement<string> language, DataFactoryElement<string> systemId, DataFactoryElement<string> userName, DataFactorySecretBaseDefinition password, DataFactoryElement<string> messageServer, DataFactoryElement<string> messageServerService, DataFactoryElement<string> logonGroup, string encryptedCredential) : base(linkedServiceType, connectVia, description, parameters, annotations, additionalProperties)
         {
             Server = server;
             SystemNumber = systemNumber;
diff --git a/src/AzureDataFactory.TestingFramework/Generated/Models/SapOpenHubSource.Serialization.cs b/src/AzureDataFactory.TestingFramework/Generated/Models/SapOpenHubSource.Serialization.cs
index 8ba30f11..bbf07327 100644
--- a/src/AzureDataFactory.TestingFramework/Generated/Models/SapOpenHubSource.Serialization.cs
+++ b/src/AzureDataFactory.TestingFramework/Generated/Models/SapOpenHubSource.Serialization.cs
@@ -101,8 +101,8 @@ internal static SapOpenHubSource DeserializeSapOpenHubSource(JsonElement element
             Optional<DataFactoryElement<string>> sourceRetryWait = default;
             Optional<DataFactoryElement<int>> maxConcurrentConnections = default;
             Optional<DataFactoryElement<bool>> disableMetricsCollection = default;
-            IDictionary<string, BinaryData> additionalProperties = default;
-            Dictionary<string, BinaryData> additionalPropertiesDictionary = new Dictionary<string, BinaryData>();
+            IDictionary<string, DataFactoryElement<string>> additionalProperties = default;
+            Dictionary<string, DataFactoryElement<string>> additionalPropertiesDictionary = new Dictionary<string, DataFactoryElement<string>>();
             foreach (var property in element.EnumerateObject())
             {
                 if (property.NameEquals("excludeLastRequest"u8))
@@ -200,7 +200,7 @@ internal static SapOpenHubSource DeserializeSapOpenHubSource(JsonElement element
                     disableMetricsCollection = JsonSerializer.Deserialize<DataFactoryElement<bool>>(property.Value.GetRawText());
                     continue;
                 }
-                additionalPropertiesDictionary.Add(property.Name, BinaryData.FromString(property.Value.GetRawText()));
+                additionalPropertiesDictionary.Add(property.Name, JsonSerializer.Deserialize<DataFactoryElement<string>>(property.Value.GetRawText()));
             }
             additionalProperties = additionalPropertiesDictionary;
             return new SapOpenHubSource(type, sourceRetryCount.Value, sourceRetryWait.Value, maxConcurrentConnections.Value, disableMetricsCollection.Value, additionalProperties, queryTimeout.Value, additionalColumns.Value, excludeLastRequest.Value, baseRequestId.Value, customRfcReadTableFunctionModule.Value, sapDataColumnDelimiter.Value);
diff --git a/src/AzureDataFactory.TestingFramework/Generated/Models/SapOpenHubSource.cs b/src/AzureDataFactory.TestingFramework/Generated/Models/SapOpenHubSource.cs
index 180e4c93..6dbcbbaa 100644
--- a/src/AzureDataFactory.TestingFramework/Generated/Models/SapOpenHubSource.cs
+++ b/src/AzureDataFactory.TestingFramework/Generated/Models/SapOpenHubSource.cs
@@ -31,7 +31,7 @@ public SapOpenHubSource()
         /// <param name="baseRequestId"> The ID of request for delta loading. Once it is set, only data with requestId larger than the value of this property will be retrieved. The default value is 0. Type: integer (or Expression with resultType integer ). </param>
         /// <param name="customRfcReadTableFunctionModule"> Specifies the custom RFC function module that will be used to read data from SAP Table. Type: string (or Expression with resultType string). </param>
         /// <param name="sapDataColumnDelimiter"> The single character that will be used as delimiter passed to SAP RFC as well as splitting the output data retrieved. Type: string (or Expression with resultType string). </param>
-        internal SapOpenHubSource(string copySourceType, DataFactoryElement<int> sourceRetryCount, DataFactoryElement<string> sourceRetryWait, DataFactoryElement<int> maxConcurrentConnections, DataFactoryElement<bool> disableMetricsCollection, IDictionary<string, BinaryData> additionalProperties, DataFactoryElement<string> queryTimeout, BinaryData additionalColumns, DataFactoryElement<bool> excludeLastRequest, DataFactoryElement<int> baseRequestId, DataFactoryElement<string> customRfcReadTableFunctionModule, DataFactoryElement<string> sapDataColumnDelimiter) : base(copySourceType, sourceRetryCount, sourceRetryWait, maxConcurrentConnections, disableMetricsCollection, additionalProperties, queryTimeout, additionalColumns)
+        internal SapOpenHubSource(string copySourceType, DataFactoryElement<int> sourceRetryCount, DataFactoryElement<string> sourceRetryWait, DataFactoryElement<int> maxConcurrentConnections, DataFactoryElement<bool> disableMetricsCollection, IDictionary<string, DataFactoryElement<string>> additionalProperties, DataFactoryElement<string> queryTimeout, BinaryData additionalColumns, DataFactoryElement<bool> excludeLastRequest, DataFactoryElement<int> baseRequestId, DataFactoryElement<string> customRfcReadTableFunctionModule, DataFactoryElement<string> sapDataColumnDelimiter) : base(copySourceType, sourceRetryCount, sourceRetryWait, maxConcurrentConnections, disableMetricsCollection, additionalProperties, queryTimeout, additionalColumns)
         {
             ExcludeLastRequest = excludeLastRequest;
             BaseRequestId = baseRequestId;
diff --git a/src/AzureDataFactory.TestingFramework/Generated/Models/SapOpenHubTableDataset.Serialization.cs b/src/AzureDataFactory.TestingFramework/Generated/Models/SapOpenHubTableDataset.Serialization.cs
index cb56a77b..0242b30c 100644
--- a/src/AzureDataFactory.TestingFramework/Generated/Models/SapOpenHubTableDataset.Serialization.cs
+++ b/src/AzureDataFactory.TestingFramework/Generated/Models/SapOpenHubTableDataset.Serialization.cs
@@ -113,8 +113,8 @@ internal static SapOpenHubTableDataset DeserializeSapOpenHubTableDataset(JsonEle
             DataFactoryElement<string> openHubDestinationName = default;
             Optional<DataFactoryElement<bool>> excludeLastRequest = default;
             Optional<DataFactoryElement<int>> baseRequestId = default;
-            IDictionary<string, BinaryData> additionalProperties = default;
-            Dictionary<string, BinaryData> additionalPropertiesDictionary = new Dictionary<string, BinaryData>();
+            IDictionary<string, DataFactoryElement<string>> additionalProperties = default;
+            Dictionary<string, DataFactoryElement<string>> additionalPropertiesDictionary = new Dictionary<string, DataFactoryElement<string>>();
             foreach (var property in element.EnumerateObject())
             {
                 if (property.NameEquals("type"u8))
@@ -229,7 +229,7 @@ internal static SapOpenHubTableDataset DeserializeSapOpenHubTableDataset(JsonEle
                     }
                     continue;
                 }
-                additionalPropertiesDictionary.Add(property.Name, BinaryData.FromString(property.Value.GetRawText()));
+                additionalPropertiesDictionary.Add(property.Name, JsonSerializer.Deserialize<DataFactoryElement<string>>(property.Value.GetRawText()));
             }
             additionalProperties = additionalPropertiesDictionary;
             return new SapOpenHubTableDataset(type, description.Value, structure.Value, schema.Value, linkedServiceName, Optional.ToDictionary(parameters), Optional.ToList(annotations), folder.Value, additionalProperties, openHubDestinationName, excludeLastRequest.Value, baseRequestId.Value);
diff --git a/src/AzureDataFactory.TestingFramework/Generated/Models/SapOpenHubTableDataset.cs b/src/AzureDataFactory.TestingFramework/Generated/Models/SapOpenHubTableDataset.cs
index 136b17cf..1b3ba51e 100644
--- a/src/AzureDataFactory.TestingFramework/Generated/Models/SapOpenHubTableDataset.cs
+++ b/src/AzureDataFactory.TestingFramework/Generated/Models/SapOpenHubTableDataset.cs
@@ -39,7 +39,7 @@ public SapOpenHubTableDataset(DataFactoryLinkedServiceReference linkedServiceNam
         /// <param name="openHubDestinationName"> The name of the Open Hub Destination with destination type as Database Table. Type: string (or Expression with resultType string). </param>
         /// <param name="excludeLastRequest"> Whether to exclude the records of the last request. The default value is true. Type: boolean (or Expression with resultType boolean). </param>
         /// <param name="baseRequestId"> The ID of request for delta loading. Once it is set, only data with requestId larger than the value of this property will be retrieved. The default value is 0. Type: integer (or Expression with resultType integer ). </param>
-        internal SapOpenHubTableDataset(string datasetType, string description, DataFactoryElement<IList<DatasetDataElement>> structure, DataFactoryElement<IList<DatasetSchemaDataElement>> schema, DataFactoryLinkedServiceReference linkedServiceName, IDictionary<string, EntityParameterSpecification> parameters, IList<BinaryData> annotations, DatasetFolder folder, IDictionary<string, BinaryData> additionalProperties, DataFactoryElement<string> openHubDestinationName, DataFactoryElement<bool> excludeLastRequest, DataFactoryElement<int> baseRequestId) : base(datasetType, description, structure, schema, linkedServiceName, parameters, annotations, folder, additionalProperties)
+        internal SapOpenHubTableDataset(string datasetType, string description, DataFactoryElement<IList<DatasetDataElement>> structure, DataFactoryElement<IList<DatasetSchemaDataElement>> schema, DataFactoryLinkedServiceReference linkedServiceName, IDictionary<string, EntityParameterSpecification> parameters, IList<BinaryData> annotations, DatasetFolder folder, IDictionary<string, DataFactoryElement<string>> additionalProperties, DataFactoryElement<string> openHubDestinationName, DataFactoryElement<bool> excludeLastRequest, DataFactoryElement<int> baseRequestId) : base(datasetType, description, structure, schema, linkedServiceName, parameters, annotations, folder, additionalProperties)
         {
             OpenHubDestinationName = openHubDestinationName;
             ExcludeLastRequest = excludeLastRequest;
diff --git a/src/AzureDataFactory.TestingFramework/Generated/Models/SapTableLinkedService.Serialization.cs b/src/AzureDataFactory.TestingFramework/Generated/Models/SapTableLinkedService.Serialization.cs
index f7a28968..a664b65f 100644
--- a/src/AzureDataFactory.TestingFramework/Generated/Models/SapTableLinkedService.Serialization.cs
+++ b/src/AzureDataFactory.TestingFramework/Generated/Models/SapTableLinkedService.Serialization.cs
@@ -180,8 +180,8 @@ internal static SapTableLinkedService DeserializeSapTableLinkedService(JsonEleme
             Optional<DataFactoryElement<string>> sncQop = default;
             Optional<DataFactoryElement<string>> logonGroup = default;
             Optional<string> encryptedCredential = default;
-            IDictionary<string, BinaryData> additionalProperties = default;
-            Dictionary<string, BinaryData> additionalPropertiesDictionary = new Dictionary<string, BinaryData>();
+            IDictionary<string, DataFactoryElement<string>> additionalProperties = default;
+            Dictionary<string, DataFactoryElement<string>> additionalPropertiesDictionary = new Dictionary<string, DataFactoryElement<string>>();
             foreach (var property in element.EnumerateObject())
             {
                 if (property.NameEquals("type"u8))
@@ -390,7 +390,7 @@ internal static SapTableLinkedService DeserializeSapTableLinkedService(JsonEleme
                     }
                     continue;
                 }
-                additionalPropertiesDictionary.Add(property.Name, BinaryData.FromString(property.Value.GetRawText()));
+                additionalPropertiesDictionary.Add(property.Name, JsonSerializer.Deserialize<DataFactoryElement<string>>(property.Value.GetRawText()));
             }
             additionalProperties = additionalPropertiesDictionary;
             return new SapTableLinkedService(type, connectVia.Value, description.Value, Optional.ToDictionary(parameters), Optional.ToList(annotations), additionalProperties, server.Value, systemNumber.Value, clientId.Value, language.Value, systemId.Value, userName.Value, password, messageServer.Value, messageServerService.Value, sncMode.Value, sncMyName.Value, sncPartnerName.Value, sncLibraryPath.Value, sncQop.Value, logonGroup.Value, encryptedCredential.Value);
diff --git a/src/AzureDataFactory.TestingFramework/Generated/Models/SapTableLinkedService.cs b/src/AzureDataFactory.TestingFramework/Generated/Models/SapTableLinkedService.cs
index f5ab6205..9197dacf 100644
--- a/src/AzureDataFactory.TestingFramework/Generated/Models/SapTableLinkedService.cs
+++ b/src/AzureDataFactory.TestingFramework/Generated/Models/SapTableLinkedService.cs
@@ -41,7 +41,7 @@ public SapTableLinkedService()
         /// <param name="sncQop"> SNC Quality of Protection. Allowed value include: 1, 2, 3, 8, 9. Type: string (or Expression with resultType string). </param>
         /// <param name="logonGroup"> The Logon Group for the SAP System. Type: string (or Expression with resultType string). </param>
         /// <param name="encryptedCredential"> The encrypted credential used for authentication. Credentials are encrypted using the integration runtime credential manager. Type: string. </param>
-        internal SapTableLinkedService(string linkedServiceType, IntegrationRuntimeReference connectVia, string description, IDictionary<string, EntityParameterSpecification> parameters, IList<BinaryData> annotations, IDictionary<string, BinaryData> additionalProperties, DataFactoryElement<string> server, DataFactoryElement<string> systemNumber, DataFactoryElement<string> clientId, DataFactoryElement<string> language, DataFactoryElement<string> systemId, DataFactoryElement<string> userName, DataFactorySecretBaseDefinition password, DataFactoryElement<string> messageServer, DataFactoryElement<string> messageServerService, DataFactoryElement<string> sncMode, DataFactoryElement<string> sncMyName, DataFactoryElement<string> sncPartnerName, DataFactoryElement<string> sncLibraryPath, DataFactoryElement<string> sncQop, DataFactoryElement<string> logonGroup, string encryptedCredential) : base(linkedServiceType, connectVia, description, parameters, annotations, additionalProperties)
+        internal SapTableLinkedService(string linkedServiceType, IntegrationRuntimeReference connectVia, string description, IDictionary<string, EntityParameterSpecification> parameters, IList<BinaryData> annotations, IDictionary<string, DataFactoryElement<string>> additionalProperties, DataFactoryElement<string> server, DataFactoryElement<string> systemNumber, DataFactoryElement<string> clientId, DataFactoryElement<string> language, DataFactoryElement<string> systemId, DataFactoryElement<string> userName, DataFactorySecretBaseDefinition password, DataFactoryElement<string> messageServer, DataFactoryElement<string> messageServerService, DataFactoryElement<string> sncMode, DataFactoryElement<string> sncMyName, DataFactoryElement<string> sncPartnerName, DataFactoryElement<string> sncLibraryPath, DataFactoryElement<string> sncQop, DataFactoryElement<string> logonGroup, string encryptedCredential) : base(linkedServiceType, connectVia, description, parameters, annotations, additionalProperties)
         {
             Server = server;
             SystemNumber = systemNumber;
diff --git a/src/AzureDataFactory.TestingFramework/Generated/Models/SapTableResourceDataset.Serialization.cs b/src/AzureDataFactory.TestingFramework/Generated/Models/SapTableResourceDataset.Serialization.cs
index e76f70d6..5c398f9c 100644
--- a/src/AzureDataFactory.TestingFramework/Generated/Models/SapTableResourceDataset.Serialization.cs
+++ b/src/AzureDataFactory.TestingFramework/Generated/Models/SapTableResourceDataset.Serialization.cs
@@ -101,8 +101,8 @@ internal static SapTableResourceDataset DeserializeSapTableResourceDataset(JsonE
             Optional<IList<BinaryData>> annotations = default;
             Optional<DatasetFolder> folder = default;
             DataFactoryElement<string> tableName = default;
-            IDictionary<string, BinaryData> additionalProperties = default;
-            Dictionary<string, BinaryData> additionalPropertiesDictionary = new Dictionary<string, BinaryData>();
+            IDictionary<string, DataFactoryElement<string>> additionalProperties = default;
+            Dictionary<string, DataFactoryElement<string>> additionalPropertiesDictionary = new Dictionary<string, DataFactoryElement<string>>();
             foreach (var property in element.EnumerateObject())
             {
                 if (property.NameEquals("type"u8))
@@ -199,7 +199,7 @@ internal static SapTableResourceDataset DeserializeSapTableResourceDataset(JsonE
                     }
                     continue;
                 }
-                additionalPropertiesDictionary.Add(property.Name, BinaryData.FromString(property.Value.GetRawText()));
+                additionalPropertiesDictionary.Add(property.Name, JsonSerializer.Deserialize<DataFactoryElement<string>>(property.Value.GetRawText()));
             }
             additionalProperties = additionalPropertiesDictionary;
             return new SapTableResourceDataset(type, description.Value, structure.Value, schema.Value, linkedServiceName, Optional.ToDictionary(parameters), Optional.ToList(annotations), folder.Value, additionalProperties, tableName);
diff --git a/src/AzureDataFactory.TestingFramework/Generated/Models/SapTableResourceDataset.cs b/src/AzureDataFactory.TestingFramework/Generated/Models/SapTableResourceDataset.cs
index 13e25cb6..a960a232 100644
--- a/src/AzureDataFactory.TestingFramework/Generated/Models/SapTableResourceDataset.cs
+++ b/src/AzureDataFactory.TestingFramework/Generated/Models/SapTableResourceDataset.cs
@@ -37,7 +37,7 @@ public SapTableResourceDataset(DataFactoryLinkedServiceReference linkedServiceNa
         /// <param name="folder"> The folder that this Dataset is in. If not specified, Dataset will appear at the root level. </param>
         /// <param name="additionalProperties"> Additional Properties. </param>
         /// <param name="tableName"> The name of the SAP Table. Type: string (or Expression with resultType string). </param>
-        internal SapTableResourceDataset(string datasetType, string description, DataFactoryElement<IList<DatasetDataElement>> structure, DataFactoryElement<IList<DatasetSchemaDataElement>> schema, DataFactoryLinkedServiceReference linkedServiceName, IDictionary<string, EntityParameterSpecification> parameters, IList<BinaryData> annotations, DatasetFolder folder, IDictionary<string, BinaryData> additionalProperties, DataFactoryElement<string> tableName) : base(datasetType, description, structure, schema, linkedServiceName, parameters, annotations, folder, additionalProperties)
+        internal SapTableResourceDataset(string datasetType, string description, DataFactoryElement<IList<DatasetDataElement>> structure, DataFactoryElement<IList<DatasetSchemaDataElement>> schema, DataFactoryLinkedServiceReference linkedServiceName, IDictionary<string, EntityParameterSpecification> parameters, IList<BinaryData> annotations, DatasetFolder folder, IDictionary<string, DataFactoryElement<string>> additionalProperties, DataFactoryElement<string> tableName) : base(datasetType, description, structure, schema, linkedServiceName, parameters, annotations, folder, additionalProperties)
         {
             TableName = tableName;
             DatasetType = datasetType ?? "SapTableResource";
diff --git a/src/AzureDataFactory.TestingFramework/Generated/Models/SapTableSource.Serialization.cs b/src/AzureDataFactory.TestingFramework/Generated/Models/SapTableSource.Serialization.cs
index e91dabbd..3351e5ff 100644
--- a/src/AzureDataFactory.TestingFramework/Generated/Models/SapTableSource.Serialization.cs
+++ b/src/AzureDataFactory.TestingFramework/Generated/Models/SapTableSource.Serialization.cs
@@ -135,8 +135,8 @@ internal static SapTableSource DeserializeSapTableSource(JsonElement element)
             Optional<DataFactoryElement<string>> sourceRetryWait = default;
             Optional<DataFactoryElement<int>> maxConcurrentConnections = default;
             Optional<DataFactoryElement<bool>> disableMetricsCollection = default;
-            IDictionary<string, BinaryData> additionalProperties = default;
-            Dictionary<string, BinaryData> additionalPropertiesDictionary = new Dictionary<string, BinaryData>();
+            IDictionary<string, DataFactoryElement<string>> additionalProperties = default;
+            Dictionary<string, DataFactoryElement<string>> additionalPropertiesDictionary = new Dictionary<string, DataFactoryElement<string>>();
             foreach (var property in element.EnumerateObject())
             {
                 if (property.NameEquals("rowCount"u8))
@@ -279,7 +279,7 @@ internal static SapTableSource DeserializeSapTableSource(JsonElement element)
                     disableMetricsCollection = JsonSerializer.Deserialize<DataFactoryElement<bool>>(property.Value.GetRawText());
                     continue;
                 }
-                additionalPropertiesDictionary.Add(property.Name, BinaryData.FromString(property.Value.GetRawText()));
+                additionalPropertiesDictionary.Add(property.Name, JsonSerializer.Deserialize<DataFactoryElement<string>>(property.Value.GetRawText()));
             }
             additionalProperties = additionalPropertiesDictionary;
             return new SapTableSource(type, sourceRetryCount.Value, sourceRetryWait.Value, maxConcurrentConnections.Value, disableMetricsCollection.Value, additionalProperties, queryTimeout.Value, additionalColumns.Value, rowCount.Value, rowSkips.Value, rfcTableFields.Value, rfcTableOptions.Value, batchSize.Value, customRfcReadTableFunctionModule.Value, sapDataColumnDelimiter.Value, partitionOption.Value, partitionSettings.Value);
diff --git a/src/AzureDataFactory.TestingFramework/Generated/Models/SapTableSource.cs b/src/AzureDataFactory.TestingFramework/Generated/Models/SapTableSource.cs
index 78128216..4f3d07f9 100644
--- a/src/AzureDataFactory.TestingFramework/Generated/Models/SapTableSource.cs
+++ b/src/AzureDataFactory.TestingFramework/Generated/Models/SapTableSource.cs
@@ -36,7 +36,7 @@ public SapTableSource()
         /// <param name="sapDataColumnDelimiter"> The single character that will be used as delimiter passed to SAP RFC as well as splitting the output data retrieved. Type: string (or Expression with resultType string). </param>
         /// <param name="partitionOption"> The partition mechanism that will be used for SAP table read in parallel. Possible values include: "None", "PartitionOnInt", "PartitionOnCalendarYear", "PartitionOnCalendarMonth", "PartitionOnCalendarDate", "PartitionOnTime". </param>
         /// <param name="partitionSettings"> The settings that will be leveraged for SAP table source partitioning. </param>
-        internal SapTableSource(string copySourceType, DataFactoryElement<int> sourceRetryCount, DataFactoryElement<string> sourceRetryWait, DataFactoryElement<int> maxConcurrentConnections, DataFactoryElement<bool> disableMetricsCollection, IDictionary<string, BinaryData> additionalProperties, DataFactoryElement<string> queryTimeout, BinaryData additionalColumns, DataFactoryElement<int> rowCount, DataFactoryElement<int> rowSkips, DataFactoryElement<string> rfcTableFields, DataFactoryElement<string> rfcTableOptions, DataFactoryElement<int> batchSize, DataFactoryElement<string> customRfcReadTableFunctionModule, DataFactoryElement<string> sapDataColumnDelimiter, BinaryData partitionOption, SapTablePartitionSettings partitionSettings) : base(copySourceType, sourceRetryCount, sourceRetryWait, maxConcurrentConnections, disableMetricsCollection, additionalProperties, queryTimeout, additionalColumns)
+        internal SapTableSource(string copySourceType, DataFactoryElement<int> sourceRetryCount, DataFactoryElement<string> sourceRetryWait, DataFactoryElement<int> maxConcurrentConnections, DataFactoryElement<bool> disableMetricsCollection, IDictionary<string, DataFactoryElement<string>> additionalProperties, DataFactoryElement<string> queryTimeout, BinaryData additionalColumns, DataFactoryElement<int> rowCount, DataFactoryElement<int> rowSkips, DataFactoryElement<string> rfcTableFields, DataFactoryElement<string> rfcTableOptions, DataFactoryElement<int> batchSize, DataFactoryElement<string> customRfcReadTableFunctionModule, DataFactoryElement<string> sapDataColumnDelimiter, BinaryData partitionOption, SapTablePartitionSettings partitionSettings) : base(copySourceType, sourceRetryCount, sourceRetryWait, maxConcurrentConnections, disableMetricsCollection, additionalProperties, queryTimeout, additionalColumns)
         {
             RowCount = rowCount;
             RowSkips = rowSkips;
diff --git a/src/AzureDataFactory.TestingFramework/Generated/Models/ScheduleTriggerRecurrence.Serialization.cs b/src/AzureDataFactory.TestingFramework/Generated/Models/ScheduleTriggerRecurrence.Serialization.cs
index e0863d5e..97c12772 100644
--- a/src/AzureDataFactory.TestingFramework/Generated/Models/ScheduleTriggerRecurrence.Serialization.cs
+++ b/src/AzureDataFactory.TestingFramework/Generated/Models/ScheduleTriggerRecurrence.Serialization.cs
@@ -7,6 +7,7 @@
 
 using System.Text.Json;
 using Azure.Core;
+using Azure.Core.Expressions.DataFactory;
 
 namespace AzureDataFactory.TestingFramework.Models
 {
@@ -69,8 +70,8 @@ internal static ScheduleTriggerRecurrence DeserializeScheduleTriggerRecurrence(J
             Optional<DateTimeOffset> endTime = default;
             Optional<string> timeZone = default;
             Optional<DataFactoryRecurrenceSchedule> schedule = default;
-            IDictionary<string, BinaryData> additionalProperties = default;
-            Dictionary<string, BinaryData> additionalPropertiesDictionary = new Dictionary<string, BinaryData>();
+            IDictionary<string, DataFactoryElement<string>> additionalProperties = default;
+            Dictionary<string, DataFactoryElement<string>> additionalPropertiesDictionary = new Dictionary<string, DataFactoryElement<string>>();
             foreach (var property in element.EnumerateObject())
             {
                 if (property.NameEquals("frequency"u8))
@@ -123,7 +124,7 @@ internal static ScheduleTriggerRecurrence DeserializeScheduleTriggerRecurrence(J
                     schedule = DataFactoryRecurrenceSchedule.DeserializeDataFactoryRecurrenceSchedule(property.Value);
                     continue;
                 }
-                additionalPropertiesDictionary.Add(property.Name, BinaryData.FromString(property.Value.GetRawText()));
+                additionalPropertiesDictionary.Add(property.Name, JsonSerializer.Deserialize<DataFactoryElement<string>>(property.Value.GetRawText()));
             }
             additionalProperties = additionalPropertiesDictionary;
             return new ScheduleTriggerRecurrence(Optional.ToNullable(frequency), Optional.ToNullable(interval), Optional.ToNullable(startTime), Optional.ToNullable(endTime), timeZone.Value, schedule.Value, additionalProperties);
diff --git a/src/AzureDataFactory.TestingFramework/Generated/Models/ScheduleTriggerRecurrence.cs b/src/AzureDataFactory.TestingFramework/Generated/Models/ScheduleTriggerRecurrence.cs
index 428636be..34bd92bd 100644
--- a/src/AzureDataFactory.TestingFramework/Generated/Models/ScheduleTriggerRecurrence.cs
+++ b/src/AzureDataFactory.TestingFramework/Generated/Models/ScheduleTriggerRecurrence.cs
@@ -6,6 +6,7 @@
 #nullable disable
 
 using Azure.Core;
+using Azure.Core.Expressions.DataFactory;
 
 namespace AzureDataFactory.TestingFramework.Models
 {
@@ -15,7 +16,7 @@ public partial class ScheduleTriggerRecurrence
         /// <summary> Initializes a new instance of ScheduleTriggerRecurrence. </summary>
         public ScheduleTriggerRecurrence()
         {
-            AdditionalProperties = new ChangeTrackingDictionary<string, BinaryData>();
+            AdditionalProperties = new ChangeTrackingDictionary<string, DataFactoryElement<string>>();
         }
 
         /// <summary> Initializes a new instance of ScheduleTriggerRecurrence. </summary>
@@ -26,7 +27,7 @@ public ScheduleTriggerRecurrence()
         /// <param name="timeZone"> The time zone. </param>
         /// <param name="schedule"> The recurrence schedule. </param>
         /// <param name="additionalProperties"> Additional Properties. </param>
-        internal ScheduleTriggerRecurrence(DataFactoryRecurrenceFrequency? frequency, int? interval, DateTimeOffset? startOn, DateTimeOffset? endOn, string timeZone, DataFactoryRecurrenceSchedule schedule, IDictionary<string, BinaryData> additionalProperties)
+        internal ScheduleTriggerRecurrence(DataFactoryRecurrenceFrequency? frequency, int? interval, DateTimeOffset? startOn, DateTimeOffset? endOn, string timeZone, DataFactoryRecurrenceSchedule schedule, IDictionary<string, DataFactoryElement<string>> additionalProperties)
         {
             Frequency = frequency;
             Interval = interval;
@@ -79,6 +80,6 @@ internal ScheduleTriggerRecurrence(DataFactoryRecurrenceFrequency? frequency, in
         /// </list>
         /// </para>
         /// </summary>
-        public IDictionary<string, BinaryData> AdditionalProperties { get; }
+        public IDictionary<string, DataFactoryElement<string>> AdditionalProperties { get; }
     }
 }
diff --git a/src/AzureDataFactory.TestingFramework/Generated/Models/SelfHostedIntegrationRuntime.Serialization.cs b/src/AzureDataFactory.TestingFramework/Generated/Models/SelfHostedIntegrationRuntime.Serialization.cs
index cf82bc84..1df5e2d5 100644
--- a/src/AzureDataFactory.TestingFramework/Generated/Models/SelfHostedIntegrationRuntime.Serialization.cs
+++ b/src/AzureDataFactory.TestingFramework/Generated/Models/SelfHostedIntegrationRuntime.Serialization.cs
@@ -7,6 +7,7 @@
 
 using System.Text.Json;
 using Azure.Core;
+using Azure.Core.Expressions.DataFactory;
 
 namespace AzureDataFactory.TestingFramework.Models
 {
@@ -51,8 +52,8 @@ internal static SelfHostedIntegrationRuntime DeserializeSelfHostedIntegrationRun
             IntegrationRuntimeType type = default;
             Optional<string> description = default;
             Optional<LinkedIntegrationRuntimeType> linkedInfo = default;
-            IDictionary<string, BinaryData> additionalProperties = default;
-            Dictionary<string, BinaryData> additionalPropertiesDictionary = new Dictionary<string, BinaryData>();
+            IDictionary<string, DataFactoryElement<string>> additionalProperties = default;
+            Dictionary<string, DataFactoryElement<string>> additionalPropertiesDictionary = new Dictionary<string, DataFactoryElement<string>>();
             foreach (var property in element.EnumerateObject())
             {
                 if (property.NameEquals("type"u8))
@@ -86,7 +87,7 @@ internal static SelfHostedIntegrationRuntime DeserializeSelfHostedIntegrationRun
                     }
                     continue;
                 }
-                additionalPropertiesDictionary.Add(property.Name, BinaryData.FromString(property.Value.GetRawText()));
+                additionalPropertiesDictionary.Add(property.Name, JsonSerializer.Deserialize<DataFactoryElement<string>>(property.Value.GetRawText()));
             }
             additionalProperties = additionalPropertiesDictionary;
             return new SelfHostedIntegrationRuntime(type, description.Value, additionalProperties, linkedInfo.Value);
diff --git a/src/AzureDataFactory.TestingFramework/Generated/Models/SelfHostedIntegrationRuntime.cs b/src/AzureDataFactory.TestingFramework/Generated/Models/SelfHostedIntegrationRuntime.cs
index c059193b..f3e8cdb9 100644
--- a/src/AzureDataFactory.TestingFramework/Generated/Models/SelfHostedIntegrationRuntime.cs
+++ b/src/AzureDataFactory.TestingFramework/Generated/Models/SelfHostedIntegrationRuntime.cs
@@ -5,6 +5,8 @@
 
 #nullable disable
 
+using Azure.Core.Expressions.DataFactory;
+
 namespace AzureDataFactory.TestingFramework.Models
 {
     /// <summary> Self-hosted integration runtime. </summary>
@@ -25,7 +27,7 @@ public SelfHostedIntegrationRuntime()
         /// Please note <see cref="LinkedIntegrationRuntimeType"/> is the base class. According to the scenario, a derived class of the base class might need to be assigned here, or this property needs to be casted to one of the possible derived classes.
         /// The available derived classes include <see cref="LinkedIntegrationRuntimeKeyAuthorization"/> and <see cref="LinkedIntegrationRuntimeRbacAuthorization"/>.
         /// </param>
-        internal SelfHostedIntegrationRuntime(IntegrationRuntimeType integrationRuntimeType, string description, IDictionary<string, BinaryData> additionalProperties, LinkedIntegrationRuntimeType linkedInfo) : base(integrationRuntimeType, description, additionalProperties)
+        internal SelfHostedIntegrationRuntime(IntegrationRuntimeType integrationRuntimeType, string description, IDictionary<string, DataFactoryElement<string>> additionalProperties, LinkedIntegrationRuntimeType linkedInfo) : base(integrationRuntimeType, description, additionalProperties)
         {
             LinkedInfo = linkedInfo;
             IntegrationRuntimeType = integrationRuntimeType;
diff --git a/src/AzureDataFactory.TestingFramework/Generated/Models/SelfHostedIntegrationRuntimeNode.Serialization.cs b/src/AzureDataFactory.TestingFramework/Generated/Models/SelfHostedIntegrationRuntimeNode.Serialization.cs
index b9c72b1f..f128c1d1 100644
--- a/src/AzureDataFactory.TestingFramework/Generated/Models/SelfHostedIntegrationRuntimeNode.Serialization.cs
+++ b/src/AzureDataFactory.TestingFramework/Generated/Models/SelfHostedIntegrationRuntimeNode.Serialization.cs
@@ -7,6 +7,7 @@
 
 using System.Text.Json;
 using Azure.Core;
+using Azure.Core.Expressions.DataFactory;
 
 namespace AzureDataFactory.TestingFramework.Models
 {
@@ -36,8 +37,8 @@ internal static SelfHostedIntegrationRuntimeNode DeserializeSelfHostedIntegratio
             Optional<bool> isActiveDispatcher = default;
             Optional<int> concurrentJobsLimit = default;
             Optional<int> maxConcurrentJobs = default;
-            IReadOnlyDictionary<string, BinaryData> additionalProperties = default;
-            Dictionary<string, BinaryData> additionalPropertiesDictionary = new Dictionary<string, BinaryData>();
+            IReadOnlyDictionary<string, DataFactoryElement<string>> additionalProperties = default;
+            Dictionary<string, DataFactoryElement<string>> additionalPropertiesDictionary = new Dictionary<string, DataFactoryElement<string>>();
             foreach (var property in element.EnumerateObject())
             {
                 if (property.NameEquals("nodeName"u8))
@@ -191,7 +192,7 @@ internal static SelfHostedIntegrationRuntimeNode DeserializeSelfHostedIntegratio
                     maxConcurrentJobs = property.Value.GetInt32();
                     continue;
                 }
-                additionalPropertiesDictionary.Add(property.Name, BinaryData.FromString(property.Value.GetRawText()));
+                additionalPropertiesDictionary.Add(property.Name, JsonSerializer.Deserialize<DataFactoryElement<string>>(property.Value.GetRawText()));
             }
             additionalProperties = additionalPropertiesDictionary;
             return new SelfHostedIntegrationRuntimeNode(nodeName.Value, machineName.Value, hostServiceUri.Value, Optional.ToNullable(status), Optional.ToDictionary(capabilities), versionStatus.Value, version.Value, Optional.ToNullable(registerTime), Optional.ToNullable(lastConnectTime), Optional.ToNullable(expiryTime), Optional.ToNullable(lastStartTime), Optional.ToNullable(lastStopTime), Optional.ToNullable(lastUpdateResult), Optional.ToNullable(lastStartUpdateTime), Optional.ToNullable(lastEndUpdateTime), Optional.ToNullable(isActiveDispatcher), Optional.ToNullable(concurrentJobsLimit), Optional.ToNullable(maxConcurrentJobs), additionalProperties);
diff --git a/src/AzureDataFactory.TestingFramework/Generated/Models/SelfHostedIntegrationRuntimeNode.cs b/src/AzureDataFactory.TestingFramework/Generated/Models/SelfHostedIntegrationRuntimeNode.cs
index 892f687e..6f10a616 100644
--- a/src/AzureDataFactory.TestingFramework/Generated/Models/SelfHostedIntegrationRuntimeNode.cs
+++ b/src/AzureDataFactory.TestingFramework/Generated/Models/SelfHostedIntegrationRuntimeNode.cs
@@ -6,6 +6,7 @@
 #nullable disable
 
 using Azure.Core;
+using Azure.Core.Expressions.DataFactory;
 
 namespace AzureDataFactory.TestingFramework.Models
 {
@@ -16,7 +17,7 @@ public partial class SelfHostedIntegrationRuntimeNode
         internal SelfHostedIntegrationRuntimeNode()
         {
             Capabilities = new ChangeTrackingDictionary<string, string>();
-            AdditionalProperties = new ChangeTrackingDictionary<string, BinaryData>();
+            AdditionalProperties = new ChangeTrackingDictionary<string, DataFactoryElement<string>>();
         }
 
         /// <summary> Initializes a new instance of SelfHostedIntegrationRuntimeNode. </summary>
@@ -39,7 +40,7 @@ internal SelfHostedIntegrationRuntimeNode()
         /// <param name="concurrentJobsLimit"> Maximum concurrent jobs on the integration runtime node. </param>
         /// <param name="maxConcurrentJobs"> The maximum concurrent jobs in this integration runtime. </param>
         /// <param name="additionalProperties"> Additional Properties. </param>
-        internal SelfHostedIntegrationRuntimeNode(string nodeName, string machineName, Uri hostServiceUri, SelfHostedIntegrationRuntimeNodeStatus? status, IReadOnlyDictionary<string, string> capabilities, string versionStatus, string version, DateTimeOffset? registerOn, DateTimeOffset? lastConnectOn, DateTimeOffset? expireOn, DateTimeOffset? lastStartOn, DateTimeOffset? lastStopOn, IntegrationRuntimeUpdateResult? lastUpdateResult, DateTimeOffset? lastStartUpdateOn, DateTimeOffset? lastEndUpdateOn, bool? isActiveDispatcher, int? concurrentJobsLimit, int? maxConcurrentJobs, IReadOnlyDictionary<string, BinaryData> additionalProperties)
+        internal SelfHostedIntegrationRuntimeNode(string nodeName, string machineName, Uri hostServiceUri, SelfHostedIntegrationRuntimeNodeStatus? status, IReadOnlyDictionary<string, string> capabilities, string versionStatus, string version, DateTimeOffset? registerOn, DateTimeOffset? lastConnectOn, DateTimeOffset? expireOn, DateTimeOffset? lastStartOn, DateTimeOffset? lastStopOn, IntegrationRuntimeUpdateResult? lastUpdateResult, DateTimeOffset? lastStartUpdateOn, DateTimeOffset? lastEndUpdateOn, bool? isActiveDispatcher, int? concurrentJobsLimit, int? maxConcurrentJobs, IReadOnlyDictionary<string, DataFactoryElement<string>> additionalProperties)
         {
             NodeName = nodeName;
             MachineName = machineName;
@@ -128,6 +129,6 @@ internal SelfHostedIntegrationRuntimeNode(string nodeName, string machineName, U
         /// </list>
         /// </para>
         /// </summary>
-        public IReadOnlyDictionary<string, BinaryData> AdditionalProperties { get; }
+        public IReadOnlyDictionary<string, DataFactoryElement<string>> AdditionalProperties { get; }
     }
 }
diff --git a/src/AzureDataFactory.TestingFramework/Generated/Models/SelfHostedIntegrationRuntimeStatus.Serialization.cs b/src/AzureDataFactory.TestingFramework/Generated/Models/SelfHostedIntegrationRuntimeStatus.Serialization.cs
index b531178f..a42b8388 100644
--- a/src/AzureDataFactory.TestingFramework/Generated/Models/SelfHostedIntegrationRuntimeStatus.Serialization.cs
+++ b/src/AzureDataFactory.TestingFramework/Generated/Models/SelfHostedIntegrationRuntimeStatus.Serialization.cs
@@ -7,6 +7,7 @@
 
 using System.Text.Json;
 using Azure.Core;
+using Azure.Core.Expressions.DataFactory;
 
 namespace AzureDataFactory.TestingFramework.Models
 {
@@ -37,8 +38,8 @@ internal static SelfHostedIntegrationRuntimeStatus DeserializeSelfHostedIntegrat
             Optional<string> pushedVersion = default;
             Optional<string> latestVersion = default;
             Optional<DateTimeOffset> autoUpdateEta = default;
-            IReadOnlyDictionary<string, BinaryData> additionalProperties = default;
-            Dictionary<string, BinaryData> additionalPropertiesDictionary = new Dictionary<string, BinaryData>();
+            IReadOnlyDictionary<string, DataFactoryElement<string>> additionalProperties = default;
+            Dictionary<string, DataFactoryElement<string>> additionalPropertiesDictionary = new Dictionary<string, DataFactoryElement<string>>();
             foreach (var property in element.EnumerateObject())
             {
                 if (property.NameEquals("type"u8))
@@ -227,7 +228,7 @@ internal static SelfHostedIntegrationRuntimeStatus DeserializeSelfHostedIntegrat
                     }
                     continue;
                 }
-                additionalPropertiesDictionary.Add(property.Name, BinaryData.FromString(property.Value.GetRawText()));
+                additionalPropertiesDictionary.Add(property.Name, JsonSerializer.Deserialize<DataFactoryElement<string>>(property.Value.GetRawText()));
             }
             additionalProperties = additionalPropertiesDictionary;
             return new SelfHostedIntegrationRuntimeStatus(type, dataFactoryName.Value, Optional.ToNullable(state), additionalProperties, Optional.ToNullable(createTime), Optional.ToNullable(taskQueueId), Optional.ToNullable(internalChannelEncryption), version.Value, Optional.ToList(nodes), Optional.ToNullable(scheduledUpdateDate), Optional.ToNullable(updateDelayOffset), Optional.ToNullable(localTimeZoneOffset), Optional.ToDictionary(capabilities), Optional.ToList(serviceUrls), Optional.ToNullable(autoUpdate), versionStatus.Value, Optional.ToList(links), pushedVersion.Value, latestVersion.Value, Optional.ToNullable(autoUpdateEta));
diff --git a/src/AzureDataFactory.TestingFramework/Generated/Models/SelfHostedIntegrationRuntimeStatus.cs b/src/AzureDataFactory.TestingFramework/Generated/Models/SelfHostedIntegrationRuntimeStatus.cs
index cae21374..30f9bb6c 100644
--- a/src/AzureDataFactory.TestingFramework/Generated/Models/SelfHostedIntegrationRuntimeStatus.cs
+++ b/src/AzureDataFactory.TestingFramework/Generated/Models/SelfHostedIntegrationRuntimeStatus.cs
@@ -6,6 +6,7 @@
 #nullable disable
 
 using Azure.Core;
+using Azure.Core.Expressions.DataFactory;
 
 namespace AzureDataFactory.TestingFramework.Models
 {
@@ -43,7 +44,7 @@ internal SelfHostedIntegrationRuntimeStatus()
         /// <param name="pushedVersion"> The version that the integration runtime is going to update to. </param>
         /// <param name="latestVersion"> The latest version on download center. </param>
         /// <param name="autoUpdateEta"> The estimated time when the self-hosted integration runtime will be updated. </param>
-        internal SelfHostedIntegrationRuntimeStatus(IntegrationRuntimeType runtimeType, string dataFactoryName, IntegrationRuntimeState? state, IReadOnlyDictionary<string, BinaryData> additionalProperties, DateTimeOffset? createdOn, Guid? taskQueueId, IntegrationRuntimeInternalChannelEncryptionMode? internalChannelEncryption, string version, IReadOnlyList<SelfHostedIntegrationRuntimeNode> nodes, DateTimeOffset? scheduledUpdateOn, TimeSpan? updateDelayOffset, TimeSpan? localTimeZoneOffset, IReadOnlyDictionary<string, string> capabilities, IReadOnlyList<Uri> serviceUris, IntegrationRuntimeAutoUpdateState? autoUpdate, string versionStatus, IReadOnlyList<LinkedIntegrationRuntime> links, string pushedVersion, string latestVersion, DateTimeOffset? autoUpdateEta) : base(runtimeType, dataFactoryName, state, additionalProperties)
+        internal SelfHostedIntegrationRuntimeStatus(IntegrationRuntimeType runtimeType, string dataFactoryName, IntegrationRuntimeState? state, IReadOnlyDictionary<string, DataFactoryElement<string>> additionalProperties, DateTimeOffset? createdOn, Guid? taskQueueId, IntegrationRuntimeInternalChannelEncryptionMode? internalChannelEncryption, string version, IReadOnlyList<SelfHostedIntegrationRuntimeNode> nodes, DateTimeOffset? scheduledUpdateOn, TimeSpan? updateDelayOffset, TimeSpan? localTimeZoneOffset, IReadOnlyDictionary<string, string> capabilities, IReadOnlyList<Uri> serviceUris, IntegrationRuntimeAutoUpdateState? autoUpdate, string versionStatus, IReadOnlyList<LinkedIntegrationRuntime> links, string pushedVersion, string latestVersion, DateTimeOffset? autoUpdateEta) : base(runtimeType, dataFactoryName, state, additionalProperties)
         {
             CreatedOn = createdOn;
             TaskQueueId = taskQueueId;
diff --git a/src/AzureDataFactory.TestingFramework/Generated/Models/ServiceNowLinkedService.Serialization.cs b/src/AzureDataFactory.TestingFramework/Generated/Models/ServiceNowLinkedService.Serialization.cs
index 44a96751..42e71e0c 100644
--- a/src/AzureDataFactory.TestingFramework/Generated/Models/ServiceNowLinkedService.Serialization.cs
+++ b/src/AzureDataFactory.TestingFramework/Generated/Models/ServiceNowLinkedService.Serialization.cs
@@ -142,8 +142,8 @@ internal static ServiceNowLinkedService DeserializeServiceNowLinkedService(JsonE
             Optional<DataFactoryElement<bool>> useHostVerification = default;
             Optional<DataFactoryElement<bool>> usePeerVerification = default;
             Optional<string> encryptedCredential = default;
-            IDictionary<string, BinaryData> additionalProperties = default;
-            Dictionary<string, BinaryData> additionalPropertiesDictionary = new Dictionary<string, BinaryData>();
+            IDictionary<string, DataFactoryElement<string>> additionalProperties = default;
+            Dictionary<string, DataFactoryElement<string>> additionalPropertiesDictionary = new Dictionary<string, DataFactoryElement<string>>();
             foreach (var property in element.EnumerateObject())
             {
                 if (property.NameEquals("type"u8))
@@ -290,7 +290,7 @@ internal static ServiceNowLinkedService DeserializeServiceNowLinkedService(JsonE
                     }
                     continue;
                 }
-                additionalPropertiesDictionary.Add(property.Name, BinaryData.FromString(property.Value.GetRawText()));
+                additionalPropertiesDictionary.Add(property.Name, JsonSerializer.Deserialize<DataFactoryElement<string>>(property.Value.GetRawText()));
             }
             additionalProperties = additionalPropertiesDictionary;
             return new ServiceNowLinkedService(type, connectVia.Value, description.Value, Optional.ToDictionary(parameters), Optional.ToList(annotations), additionalProperties, endpoint, authenticationType, username.Value, password, clientId.Value, clientSecret, useEncryptedEndpoints.Value, useHostVerification.Value, usePeerVerification.Value, encryptedCredential.Value);
diff --git a/src/AzureDataFactory.TestingFramework/Generated/Models/ServiceNowLinkedService.cs b/src/AzureDataFactory.TestingFramework/Generated/Models/ServiceNowLinkedService.cs
index 53441fa9..55c7d63c 100644
--- a/src/AzureDataFactory.TestingFramework/Generated/Models/ServiceNowLinkedService.cs
+++ b/src/AzureDataFactory.TestingFramework/Generated/Models/ServiceNowLinkedService.cs
@@ -43,7 +43,7 @@ public ServiceNowLinkedService(BinaryData endpoint, ServiceNowAuthenticationType
         /// <param name="useHostVerification"> Specifies whether to require the host name in the server's certificate to match the host name of the server when connecting over SSL. The default value is true. </param>
         /// <param name="usePeerVerification"> Specifies whether to verify the identity of the server when connecting over SSL. The default value is true. </param>
         /// <param name="encryptedCredential"> The encrypted credential used for authentication. Credentials are encrypted using the integration runtime credential manager. Type: string. </param>
-        internal ServiceNowLinkedService(string linkedServiceType, IntegrationRuntimeReference connectVia, string description, IDictionary<string, EntityParameterSpecification> parameters, IList<BinaryData> annotations, IDictionary<string, BinaryData> additionalProperties, BinaryData endpoint, ServiceNowAuthenticationType authenticationType, DataFactoryElement<string> username, DataFactorySecretBaseDefinition password, DataFactoryElement<string> clientId, DataFactorySecretBaseDefinition clientSecret, DataFactoryElement<bool> useEncryptedEndpoints, DataFactoryElement<bool> useHostVerification, DataFactoryElement<bool> usePeerVerification, string encryptedCredential) : base(linkedServiceType, connectVia, description, parameters, annotations, additionalProperties)
+        internal ServiceNowLinkedService(string linkedServiceType, IntegrationRuntimeReference connectVia, string description, IDictionary<string, EntityParameterSpecification> parameters, IList<BinaryData> annotations, IDictionary<string, DataFactoryElement<string>> additionalProperties, BinaryData endpoint, ServiceNowAuthenticationType authenticationType, DataFactoryElement<string> username, DataFactorySecretBaseDefinition password, DataFactoryElement<string> clientId, DataFactorySecretBaseDefinition clientSecret, DataFactoryElement<bool> useEncryptedEndpoints, DataFactoryElement<bool> useHostVerification, DataFactoryElement<bool> usePeerVerification, string encryptedCredential) : base(linkedServiceType, connectVia, description, parameters, annotations, additionalProperties)
         {
             Endpoint = endpoint;
             AuthenticationType = authenticationType;
diff --git a/src/AzureDataFactory.TestingFramework/Generated/Models/ServiceNowObjectDataset.Serialization.cs b/src/AzureDataFactory.TestingFramework/Generated/Models/ServiceNowObjectDataset.Serialization.cs
index 59f61f41..fb08fb7b 100644
--- a/src/AzureDataFactory.TestingFramework/Generated/Models/ServiceNowObjectDataset.Serialization.cs
+++ b/src/AzureDataFactory.TestingFramework/Generated/Models/ServiceNowObjectDataset.Serialization.cs
@@ -104,8 +104,8 @@ internal static ServiceNowObjectDataset DeserializeServiceNowObjectDataset(JsonE
             Optional<IList<BinaryData>> annotations = default;
             Optional<DatasetFolder> folder = default;
             Optional<DataFactoryElement<string>> tableName = default;
-            IDictionary<string, BinaryData> additionalProperties = default;
-            Dictionary<string, BinaryData> additionalPropertiesDictionary = new Dictionary<string, BinaryData>();
+            IDictionary<string, DataFactoryElement<string>> additionalProperties = default;
+            Dictionary<string, DataFactoryElement<string>> additionalPropertiesDictionary = new Dictionary<string, DataFactoryElement<string>>();
             foreach (var property in element.EnumerateObject())
             {
                 if (property.NameEquals("type"u8))
@@ -206,7 +206,7 @@ internal static ServiceNowObjectDataset DeserializeServiceNowObjectDataset(JsonE
                     }
                     continue;
                 }
-                additionalPropertiesDictionary.Add(property.Name, BinaryData.FromString(property.Value.GetRawText()));
+                additionalPropertiesDictionary.Add(property.Name, JsonSerializer.Deserialize<DataFactoryElement<string>>(property.Value.GetRawText()));
             }
             additionalProperties = additionalPropertiesDictionary;
             return new ServiceNowObjectDataset(type, description.Value, structure.Value, schema.Value, linkedServiceName, Optional.ToDictionary(parameters), Optional.ToList(annotations), folder.Value, additionalProperties, tableName.Value);
diff --git a/src/AzureDataFactory.TestingFramework/Generated/Models/ServiceNowObjectDataset.cs b/src/AzureDataFactory.TestingFramework/Generated/Models/ServiceNowObjectDataset.cs
index ffa9db1c..50c59e13 100644
--- a/src/AzureDataFactory.TestingFramework/Generated/Models/ServiceNowObjectDataset.cs
+++ b/src/AzureDataFactory.TestingFramework/Generated/Models/ServiceNowObjectDataset.cs
@@ -34,7 +34,7 @@ public ServiceNowObjectDataset(DataFactoryLinkedServiceReference linkedServiceNa
         /// <param name="folder"> The folder that this Dataset is in. If not specified, Dataset will appear at the root level. </param>
         /// <param name="additionalProperties"> Additional Properties. </param>
         /// <param name="tableName"> The table name. Type: string (or Expression with resultType string). </param>
-        internal ServiceNowObjectDataset(string datasetType, string description, DataFactoryElement<IList<DatasetDataElement>> structure, DataFactoryElement<IList<DatasetSchemaDataElement>> schema, DataFactoryLinkedServiceReference linkedServiceName, IDictionary<string, EntityParameterSpecification> parameters, IList<BinaryData> annotations, DatasetFolder folder, IDictionary<string, BinaryData> additionalProperties, DataFactoryElement<string> tableName) : base(datasetType, description, structure, schema, linkedServiceName, parameters, annotations, folder, additionalProperties)
+        internal ServiceNowObjectDataset(string datasetType, string description, DataFactoryElement<IList<DatasetDataElement>> structure, DataFactoryElement<IList<DatasetSchemaDataElement>> schema, DataFactoryLinkedServiceReference linkedServiceName, IDictionary<string, EntityParameterSpecification> parameters, IList<BinaryData> annotations, DatasetFolder folder, IDictionary<string, DataFactoryElement<string>> additionalProperties, DataFactoryElement<string> tableName) : base(datasetType, description, structure, schema, linkedServiceName, parameters, annotations, folder, additionalProperties)
         {
             TableName = tableName;
             DatasetType = datasetType ?? "ServiceNowObject";
diff --git a/src/AzureDataFactory.TestingFramework/Generated/Models/ServiceNowSource.Serialization.cs b/src/AzureDataFactory.TestingFramework/Generated/Models/ServiceNowSource.Serialization.cs
index fb14596c..b9186d83 100644
--- a/src/AzureDataFactory.TestingFramework/Generated/Models/ServiceNowSource.Serialization.cs
+++ b/src/AzureDataFactory.TestingFramework/Generated/Models/ServiceNowSource.Serialization.cs
@@ -83,8 +83,8 @@ internal static ServiceNowSource DeserializeServiceNowSource(JsonElement element
             Optional<DataFactoryElement<string>> sourceRetryWait = default;
             Optional<DataFactoryElement<int>> maxConcurrentConnections = default;
             Optional<DataFactoryElement<bool>> disableMetricsCollection = default;
-            IDictionary<string, BinaryData> additionalProperties = default;
-            Dictionary<string, BinaryData> additionalPropertiesDictionary = new Dictionary<string, BinaryData>();
+            IDictionary<string, DataFactoryElement<string>> additionalProperties = default;
+            Dictionary<string, DataFactoryElement<string>> additionalPropertiesDictionary = new Dictionary<string, DataFactoryElement<string>>();
             foreach (var property in element.EnumerateObject())
             {
                 if (property.NameEquals("query"u8))
@@ -155,7 +155,7 @@ internal static ServiceNowSource DeserializeServiceNowSource(JsonElement element
                     disableMetricsCollection = JsonSerializer.Deserialize<DataFactoryElement<bool>>(property.Value.GetRawText());
                     continue;
                 }
-                additionalPropertiesDictionary.Add(property.Name, BinaryData.FromString(property.Value.GetRawText()));
+                additionalPropertiesDictionary.Add(property.Name, JsonSerializer.Deserialize<DataFactoryElement<string>>(property.Value.GetRawText()));
             }
             additionalProperties = additionalPropertiesDictionary;
             return new ServiceNowSource(type, sourceRetryCount.Value, sourceRetryWait.Value, maxConcurrentConnections.Value, disableMetricsCollection.Value, additionalProperties, queryTimeout.Value, additionalColumns.Value, query.Value);
diff --git a/src/AzureDataFactory.TestingFramework/Generated/Models/ServiceNowSource.cs b/src/AzureDataFactory.TestingFramework/Generated/Models/ServiceNowSource.cs
index 6afd4a29..55c74709 100644
--- a/src/AzureDataFactory.TestingFramework/Generated/Models/ServiceNowSource.cs
+++ b/src/AzureDataFactory.TestingFramework/Generated/Models/ServiceNowSource.cs
@@ -28,7 +28,7 @@ public ServiceNowSource()
         /// <param name="queryTimeout"> Query timeout. Type: string (or Expression with resultType string), pattern: ((\d+)\.)?(\d\d):(60|([0-5][0-9])):(60|([0-5][0-9])). </param>
         /// <param name="additionalColumns"> Specifies the additional columns to be added to source data. Type: array of objects(AdditionalColumns) (or Expression with resultType array of objects). </param>
         /// <param name="query"> A query to retrieve data from source. Type: string (or Expression with resultType string). </param>
-        internal ServiceNowSource(string copySourceType, DataFactoryElement<int> sourceRetryCount, DataFactoryElement<string> sourceRetryWait, DataFactoryElement<int> maxConcurrentConnections, DataFactoryElement<bool> disableMetricsCollection, IDictionary<string, BinaryData> additionalProperties, DataFactoryElement<string> queryTimeout, BinaryData additionalColumns, DataFactoryElement<string> query) : base(copySourceType, sourceRetryCount, sourceRetryWait, maxConcurrentConnections, disableMetricsCollection, additionalProperties, queryTimeout, additionalColumns)
+        internal ServiceNowSource(string copySourceType, DataFactoryElement<int> sourceRetryCount, DataFactoryElement<string> sourceRetryWait, DataFactoryElement<int> maxConcurrentConnections, DataFactoryElement<bool> disableMetricsCollection, IDictionary<string, DataFactoryElement<string>> additionalProperties, DataFactoryElement<string> queryTimeout, BinaryData additionalColumns, DataFactoryElement<string> query) : base(copySourceType, sourceRetryCount, sourceRetryWait, maxConcurrentConnections, disableMetricsCollection, additionalProperties, queryTimeout, additionalColumns)
         {
             Query = query;
             CopySourceType = copySourceType ?? "ServiceNowSource";
diff --git a/src/AzureDataFactory.TestingFramework/Generated/Models/ServicePrincipalCredential.Serialization.cs b/src/AzureDataFactory.TestingFramework/Generated/Models/ServicePrincipalCredential.Serialization.cs
index 163f3bfe..03599935 100644
--- a/src/AzureDataFactory.TestingFramework/Generated/Models/ServicePrincipalCredential.Serialization.cs
+++ b/src/AzureDataFactory.TestingFramework/Generated/Models/ServicePrincipalCredential.Serialization.cs
@@ -92,8 +92,8 @@ internal static ServicePrincipalCredential DeserializeServicePrincipalCredential
             Optional<BinaryData> servicePrincipalId = default;
             Optional<DataFactoryKeyVaultSecretReference> servicePrincipalKey = default;
             Optional<BinaryData> tenant = default;
-            IDictionary<string, BinaryData> additionalProperties = default;
-            Dictionary<string, BinaryData> additionalPropertiesDictionary = new Dictionary<string, BinaryData>();
+            IDictionary<string, DataFactoryElement<string>> additionalProperties = default;
+            Dictionary<string, DataFactoryElement<string>> additionalPropertiesDictionary = new Dictionary<string, DataFactoryElement<string>>();
             foreach (var property in element.EnumerateObject())
             {
                 if (property.NameEquals("type"u8))
@@ -166,7 +166,7 @@ internal static ServicePrincipalCredential DeserializeServicePrincipalCredential
                     }
                     continue;
                 }
-                additionalPropertiesDictionary.Add(property.Name, BinaryData.FromString(property.Value.GetRawText()));
+                additionalPropertiesDictionary.Add(property.Name, JsonSerializer.Deserialize<DataFactoryElement<string>>(property.Value.GetRawText()));
             }
             additionalProperties = additionalPropertiesDictionary;
             return new ServicePrincipalCredential(type, description.Value, Optional.ToList(annotations), additionalProperties, servicePrincipalId.Value, servicePrincipalKey, tenant.Value);
diff --git a/src/AzureDataFactory.TestingFramework/Generated/Models/ServicePrincipalCredential.cs b/src/AzureDataFactory.TestingFramework/Generated/Models/ServicePrincipalCredential.cs
index e713bf22..b022bec9 100644
--- a/src/AzureDataFactory.TestingFramework/Generated/Models/ServicePrincipalCredential.cs
+++ b/src/AzureDataFactory.TestingFramework/Generated/Models/ServicePrincipalCredential.cs
@@ -26,7 +26,7 @@ public ServicePrincipalCredential()
         /// <param name="servicePrincipalId"> The app ID of the service principal used to authenticate. </param>
         /// <param name="servicePrincipalKey"> The key of the service principal used to authenticate. </param>
         /// <param name="tenant"> The ID of the tenant to which the service principal belongs. </param>
-        internal ServicePrincipalCredential(string credentialType, string description, IList<BinaryData> annotations, IDictionary<string, BinaryData> additionalProperties, BinaryData servicePrincipalId, DataFactoryKeyVaultSecretReference servicePrincipalKey, BinaryData tenant) : base(credentialType, description, annotations, additionalProperties)
+        internal ServicePrincipalCredential(string credentialType, string description, IList<BinaryData> annotations, IDictionary<string, DataFactoryElement<string>> additionalProperties, BinaryData servicePrincipalId, DataFactoryKeyVaultSecretReference servicePrincipalKey, BinaryData tenant) : base(credentialType, description, annotations, additionalProperties)
         {
             ServicePrincipalId = servicePrincipalId;
             ServicePrincipalKey = servicePrincipalKey;
diff --git a/src/AzureDataFactory.TestingFramework/Generated/Models/SetVariableActivity.Serialization.cs b/src/AzureDataFactory.TestingFramework/Generated/Models/SetVariableActivity.Serialization.cs
index d566d59f..2e530b24 100644
--- a/src/AzureDataFactory.TestingFramework/Generated/Models/SetVariableActivity.Serialization.cs
+++ b/src/AzureDataFactory.TestingFramework/Generated/Models/SetVariableActivity.Serialization.cs
@@ -107,8 +107,8 @@ internal static SetVariableActivity DeserializeSetVariableActivity(JsonElement e
             Optional<string> variableName = default;
             Optional<DataFactoryElement<string>> value = default;
             Optional<bool> setSystemVariable = default;
-            IDictionary<string, BinaryData> additionalProperties = default;
-            Dictionary<string, BinaryData> additionalPropertiesDictionary = new Dictionary<string, BinaryData>();
+            IDictionary<string, DataFactoryElement<string>> additionalProperties = default;
+            Dictionary<string, DataFactoryElement<string>> additionalPropertiesDictionary = new Dictionary<string, DataFactoryElement<string>>();
             foreach (var property in element.EnumerateObject())
             {
                 if (property.NameEquals("policy"u8))
@@ -216,7 +216,7 @@ internal static SetVariableActivity DeserializeSetVariableActivity(JsonElement e
                     }
                     continue;
                 }
-                additionalPropertiesDictionary.Add(property.Name, BinaryData.FromString(property.Value.GetRawText()));
+                additionalPropertiesDictionary.Add(property.Name, JsonSerializer.Deserialize<DataFactoryElement<string>>(property.Value.GetRawText()));
             }
             additionalProperties = additionalPropertiesDictionary;
             return new SetVariableActivity(name, type, description.Value, Optional.ToNullable(state), Optional.ToNullable(onInactiveMarkAs), Optional.ToList(dependsOn), Optional.ToList(userProperties), additionalProperties, policy.Value, variableName.Value, value.Value, Optional.ToNullable(setSystemVariable));
diff --git a/src/AzureDataFactory.TestingFramework/Generated/Models/SetVariableActivity.cs b/src/AzureDataFactory.TestingFramework/Generated/Models/SetVariableActivity.cs
index 97b06642..ce8bfd10 100644
--- a/src/AzureDataFactory.TestingFramework/Generated/Models/SetVariableActivity.cs
+++ b/src/AzureDataFactory.TestingFramework/Generated/Models/SetVariableActivity.cs
@@ -36,7 +36,7 @@ public SetVariableActivity(string name) : base(name)
         /// <param name="variableName"> Name of the variable whose value needs to be set. </param>
         /// <param name="value"> Value to be set. Could be a static value or Expression. </param>
         /// <param name="setSystemVariable"> If set to true, it sets the pipeline run return value. </param>
-        internal SetVariableActivity(string name, string activityType, string description, PipelineActivityState? state, ActivityOnInactiveMarkAs? onInactiveMarkAs, IList<PipelineActivityDependency> dependsOn, IList<PipelineActivityUserProperty> userProperties, IDictionary<string, BinaryData> additionalProperties, SecureInputOutputPolicy policy, string variableName, DataFactoryElement<string> value, bool? setSystemVariable) : base(name, activityType, description, state, onInactiveMarkAs, dependsOn, userProperties, additionalProperties)
+        internal SetVariableActivity(string name, string activityType, string description, PipelineActivityState? state, ActivityOnInactiveMarkAs? onInactiveMarkAs, IList<PipelineActivityDependency> dependsOn, IList<PipelineActivityUserProperty> userProperties, IDictionary<string, DataFactoryElement<string>> additionalProperties, SecureInputOutputPolicy policy, string variableName, DataFactoryElement<string> value, bool? setSystemVariable) : base(name, activityType, description, state, onInactiveMarkAs, dependsOn, userProperties, additionalProperties)
         {
             Policy = policy;
             VariableName = variableName;
diff --git a/src/AzureDataFactory.TestingFramework/Generated/Models/SftpLocation.Serialization.cs b/src/AzureDataFactory.TestingFramework/Generated/Models/SftpLocation.Serialization.cs
index 8d1d48df..69ad3457 100644
--- a/src/AzureDataFactory.TestingFramework/Generated/Models/SftpLocation.Serialization.cs
+++ b/src/AzureDataFactory.TestingFramework/Generated/Models/SftpLocation.Serialization.cs
@@ -49,8 +49,8 @@ internal static SftpLocation DeserializeSftpLocation(JsonElement element)
             string type = default;
             Optional<DataFactoryElement<string>> folderPath = default;
             Optional<DataFactoryElement<string>> fileName = default;
-            IDictionary<string, BinaryData> additionalProperties = default;
-            Dictionary<string, BinaryData> additionalPropertiesDictionary = new Dictionary<string, BinaryData>();
+            IDictionary<string, DataFactoryElement<string>> additionalProperties = default;
+            Dictionary<string, DataFactoryElement<string>> additionalPropertiesDictionary = new Dictionary<string, DataFactoryElement<string>>();
             foreach (var property in element.EnumerateObject())
             {
                 if (property.NameEquals("type"u8))
@@ -76,7 +76,7 @@ internal static SftpLocation DeserializeSftpLocation(JsonElement element)
                     fileName = JsonSerializer.Deserialize<DataFactoryElement<string>>(property.Value.GetRawText());
                     continue;
                 }
-                additionalPropertiesDictionary.Add(property.Name, BinaryData.FromString(property.Value.GetRawText()));
+                additionalPropertiesDictionary.Add(property.Name, JsonSerializer.Deserialize<DataFactoryElement<string>>(property.Value.GetRawText()));
             }
             additionalProperties = additionalPropertiesDictionary;
             return new SftpLocation(type, folderPath.Value, fileName.Value, additionalProperties);
diff --git a/src/AzureDataFactory.TestingFramework/Generated/Models/SftpLocation.cs b/src/AzureDataFactory.TestingFramework/Generated/Models/SftpLocation.cs
index 2d127001..7044430d 100644
--- a/src/AzureDataFactory.TestingFramework/Generated/Models/SftpLocation.cs
+++ b/src/AzureDataFactory.TestingFramework/Generated/Models/SftpLocation.cs
@@ -23,7 +23,7 @@ public SftpLocation()
         /// <param name="folderPath"> Specify the folder path of dataset. Type: string (or Expression with resultType string). </param>
         /// <param name="fileName"> Specify the file name of dataset. Type: string (or Expression with resultType string). </param>
         /// <param name="additionalProperties"> Additional Properties. </param>
-        internal SftpLocation(string datasetLocationType, DataFactoryElement<string> folderPath, DataFactoryElement<string> fileName, IDictionary<string, BinaryData> additionalProperties) : base(datasetLocationType, folderPath, fileName, additionalProperties)
+        internal SftpLocation(string datasetLocationType, DataFactoryElement<string> folderPath, DataFactoryElement<string> fileName, IDictionary<string, DataFactoryElement<string>> additionalProperties) : base(datasetLocationType, folderPath, fileName, additionalProperties)
         {
             DatasetLocationType = datasetLocationType ?? "SftpLocation";
         }
diff --git a/src/AzureDataFactory.TestingFramework/Generated/Models/SftpReadSettings.Serialization.cs b/src/AzureDataFactory.TestingFramework/Generated/Models/SftpReadSettings.Serialization.cs
index a121e5f0..88e8cc94 100644
--- a/src/AzureDataFactory.TestingFramework/Generated/Models/SftpReadSettings.Serialization.cs
+++ b/src/AzureDataFactory.TestingFramework/Generated/Models/SftpReadSettings.Serialization.cs
@@ -109,8 +109,8 @@ internal static SftpReadSettings DeserializeSftpReadSettings(JsonElement element
             string type = default;
             Optional<DataFactoryElement<int>> maxConcurrentConnections = default;
             Optional<DataFactoryElement<bool>> disableMetricsCollection = default;
-            IDictionary<string, BinaryData> additionalProperties = default;
-            Dictionary<string, BinaryData> additionalPropertiesDictionary = new Dictionary<string, BinaryData>();
+            IDictionary<string, DataFactoryElement<string>> additionalProperties = default;
+            Dictionary<string, DataFactoryElement<string>> additionalPropertiesDictionary = new Dictionary<string, DataFactoryElement<string>>();
             foreach (var property in element.EnumerateObject())
             {
                 if (property.NameEquals("recursive"u8))
@@ -226,7 +226,7 @@ internal static SftpReadSettings DeserializeSftpReadSettings(JsonElement element
                     disableMetricsCollection = JsonSerializer.Deserialize<DataFactoryElement<bool>>(property.Value.GetRawText());
                     continue;
                 }
-                additionalPropertiesDictionary.Add(property.Name, BinaryData.FromString(property.Value.GetRawText()));
+                additionalPropertiesDictionary.Add(property.Name, JsonSerializer.Deserialize<DataFactoryElement<string>>(property.Value.GetRawText()));
             }
             additionalProperties = additionalPropertiesDictionary;
             return new SftpReadSettings(type, maxConcurrentConnections.Value, disableMetricsCollection.Value, additionalProperties, recursive.Value, wildcardFolderPath.Value, wildcardFileName.Value, enablePartitionDiscovery.Value, partitionRootPath.Value, fileListPath.Value, deleteFilesAfterCompletion.Value, modifiedDatetimeStart.Value, modifiedDatetimeEnd.Value, disableChunking.Value);
diff --git a/src/AzureDataFactory.TestingFramework/Generated/Models/SftpReadSettings.cs b/src/AzureDataFactory.TestingFramework/Generated/Models/SftpReadSettings.cs
index a4723944..d397d848 100644
--- a/src/AzureDataFactory.TestingFramework/Generated/Models/SftpReadSettings.cs
+++ b/src/AzureDataFactory.TestingFramework/Generated/Models/SftpReadSettings.cs
@@ -33,7 +33,7 @@ public SftpReadSettings()
         /// <param name="modifiedDatetimeStart"> The start of file's modified datetime. Type: string (or Expression with resultType string). </param>
         /// <param name="modifiedDatetimeEnd"> The end of file's modified datetime. Type: string (or Expression with resultType string). </param>
         /// <param name="disableChunking"> If true, disable parallel reading within each file. Default is false. Type: boolean (or Expression with resultType boolean). </param>
-        internal SftpReadSettings(string storeReadSettingsType, DataFactoryElement<int> maxConcurrentConnections, DataFactoryElement<bool> disableMetricsCollection, IDictionary<string, BinaryData> additionalProperties, DataFactoryElement<bool> recursive, DataFactoryElement<string> wildcardFolderPath, DataFactoryElement<string> wildcardFileName, DataFactoryElement<bool> enablePartitionDiscovery, DataFactoryElement<string> partitionRootPath, DataFactoryElement<string> fileListPath, DataFactoryElement<bool> deleteFilesAfterCompletion, DataFactoryElement<string> modifiedDatetimeStart, DataFactoryElement<string> modifiedDatetimeEnd, DataFactoryElement<bool> disableChunking) : base(storeReadSettingsType, maxConcurrentConnections, disableMetricsCollection, additionalProperties)
+        internal SftpReadSettings(string storeReadSettingsType, DataFactoryElement<int> maxConcurrentConnections, DataFactoryElement<bool> disableMetricsCollection, IDictionary<string, DataFactoryElement<string>> additionalProperties, DataFactoryElement<bool> recursive, DataFactoryElement<string> wildcardFolderPath, DataFactoryElement<string> wildcardFileName, DataFactoryElement<bool> enablePartitionDiscovery, DataFactoryElement<string> partitionRootPath, DataFactoryElement<string> fileListPath, DataFactoryElement<bool> deleteFilesAfterCompletion, DataFactoryElement<string> modifiedDatetimeStart, DataFactoryElement<string> modifiedDatetimeEnd, DataFactoryElement<bool> disableChunking) : base(storeReadSettingsType, maxConcurrentConnections, disableMetricsCollection, additionalProperties)
         {
             Recursive = recursive;
             WildcardFolderPath = wildcardFolderPath;
diff --git a/src/AzureDataFactory.TestingFramework/Generated/Models/SftpServerLinkedService.Serialization.cs b/src/AzureDataFactory.TestingFramework/Generated/Models/SftpServerLinkedService.Serialization.cs
index 76f3498c..4724af9e 100644
--- a/src/AzureDataFactory.TestingFramework/Generated/Models/SftpServerLinkedService.Serialization.cs
+++ b/src/AzureDataFactory.TestingFramework/Generated/Models/SftpServerLinkedService.Serialization.cs
@@ -147,8 +147,8 @@ internal static SftpServerLinkedService DeserializeSftpServerLinkedService(JsonE
             Optional<DataFactorySecretBaseDefinition> passPhrase = default;
             Optional<DataFactoryElement<bool>> skipHostKeyValidation = default;
             Optional<DataFactoryElement<string>> hostKeyFingerprint = default;
-            IDictionary<string, BinaryData> additionalProperties = default;
-            Dictionary<string, BinaryData> additionalPropertiesDictionary = new Dictionary<string, BinaryData>();
+            IDictionary<string, DataFactoryElement<string>> additionalProperties = default;
+            Dictionary<string, DataFactoryElement<string>> additionalPropertiesDictionary = new Dictionary<string, DataFactoryElement<string>>();
             foreach (var property in element.EnumerateObject())
             {
                 if (property.NameEquals("type"u8))
@@ -308,7 +308,7 @@ internal static SftpServerLinkedService DeserializeSftpServerLinkedService(JsonE
                     }
                     continue;
                 }
-                additionalPropertiesDictionary.Add(property.Name, BinaryData.FromString(property.Value.GetRawText()));
+                additionalPropertiesDictionary.Add(property.Name, JsonSerializer.Deserialize<DataFactoryElement<string>>(property.Value.GetRawText()));
             }
             additionalProperties = additionalPropertiesDictionary;
             return new SftpServerLinkedService(type, connectVia.Value, description.Value, Optional.ToDictionary(parameters), Optional.ToList(annotations), additionalProperties, host, port.Value, Optional.ToNullable(authenticationType), userName.Value, password, encryptedCredential.Value, privateKeyPath.Value, privateKeyContent, passPhrase, skipHostKeyValidation.Value, hostKeyFingerprint.Value);
diff --git a/src/AzureDataFactory.TestingFramework/Generated/Models/SftpServerLinkedService.cs b/src/AzureDataFactory.TestingFramework/Generated/Models/SftpServerLinkedService.cs
index fe13c1b4..ffd7e739 100644
--- a/src/AzureDataFactory.TestingFramework/Generated/Models/SftpServerLinkedService.cs
+++ b/src/AzureDataFactory.TestingFramework/Generated/Models/SftpServerLinkedService.cs
@@ -42,7 +42,7 @@ public SftpServerLinkedService(DataFactoryElement<string> host)
         /// <param name="passPhrase"> The password to decrypt the SSH private key if the SSH private key is encrypted. </param>
         /// <param name="skipHostKeyValidation"> If true, skip the SSH host key validation. Default value is false. Type: boolean (or Expression with resultType boolean). </param>
         /// <param name="hostKeyFingerprint"> The host key finger-print of the SFTP server. When SkipHostKeyValidation is false, HostKeyFingerprint should be specified. Type: string (or Expression with resultType string). </param>
-        internal SftpServerLinkedService(string linkedServiceType, IntegrationRuntimeReference connectVia, string description, IDictionary<string, EntityParameterSpecification> parameters, IList<BinaryData> annotations, IDictionary<string, BinaryData> additionalProperties, DataFactoryElement<string> host, DataFactoryElement<int> port, SftpAuthenticationType? authenticationType, DataFactoryElement<string> userName, DataFactorySecretBaseDefinition password, string encryptedCredential, DataFactoryElement<string> privateKeyPath, DataFactorySecretBaseDefinition privateKeyContent, DataFactorySecretBaseDefinition passPhrase, DataFactoryElement<bool> skipHostKeyValidation, DataFactoryElement<string> hostKeyFingerprint) : base(linkedServiceType, connectVia, description, parameters, annotations, additionalProperties)
+        internal SftpServerLinkedService(string linkedServiceType, IntegrationRuntimeReference connectVia, string description, IDictionary<string, EntityParameterSpecification> parameters, IList<BinaryData> annotations, IDictionary<string, DataFactoryElement<string>> additionalProperties, DataFactoryElement<string> host, DataFactoryElement<int> port, SftpAuthenticationType? authenticationType, DataFactoryElement<string> userName, DataFactorySecretBaseDefinition password, string encryptedCredential, DataFactoryElement<string> privateKeyPath, DataFactorySecretBaseDefinition privateKeyContent, DataFactorySecretBaseDefinition passPhrase, DataFactoryElement<bool> skipHostKeyValidation, DataFactoryElement<string> hostKeyFingerprint) : base(linkedServiceType, connectVia, description, parameters, annotations, additionalProperties)
         {
             Host = host;
             Port = port;
diff --git a/src/AzureDataFactory.TestingFramework/Generated/Models/SftpWriteSettings.Serialization.cs b/src/AzureDataFactory.TestingFramework/Generated/Models/SftpWriteSettings.Serialization.cs
index 29aa79cd..8fe5d896 100644
--- a/src/AzureDataFactory.TestingFramework/Generated/Models/SftpWriteSettings.Serialization.cs
+++ b/src/AzureDataFactory.TestingFramework/Generated/Models/SftpWriteSettings.Serialization.cs
@@ -71,8 +71,8 @@ internal static SftpWriteSettings DeserializeSftpWriteSettings(JsonElement eleme
             Optional<DataFactoryElement<int>> maxConcurrentConnections = default;
             Optional<DataFactoryElement<bool>> disableMetricsCollection = default;
             Optional<BinaryData> copyBehavior = default;
-            IDictionary<string, BinaryData> additionalProperties = default;
-            Dictionary<string, BinaryData> additionalPropertiesDictionary = new Dictionary<string, BinaryData>();
+            IDictionary<string, DataFactoryElement<string>> additionalProperties = default;
+            Dictionary<string, DataFactoryElement<string>> additionalPropertiesDictionary = new Dictionary<string, DataFactoryElement<string>>();
             foreach (var property in element.EnumerateObject())
             {
                 if (property.NameEquals("operationTimeout"u8))
@@ -125,7 +125,7 @@ internal static SftpWriteSettings DeserializeSftpWriteSettings(JsonElement eleme
                     copyBehavior = BinaryData.FromString(property.Value.GetRawText());
                     continue;
                 }
-                additionalPropertiesDictionary.Add(property.Name, BinaryData.FromString(property.Value.GetRawText()));
+                additionalPropertiesDictionary.Add(property.Name, JsonSerializer.Deserialize<DataFactoryElement<string>>(property.Value.GetRawText()));
             }
             additionalProperties = additionalPropertiesDictionary;
             return new SftpWriteSettings(type, maxConcurrentConnections.Value, disableMetricsCollection.Value, copyBehavior.Value, additionalProperties, operationTimeout.Value, useTempFileRename.Value);
diff --git a/src/AzureDataFactory.TestingFramework/Generated/Models/SftpWriteSettings.cs b/src/AzureDataFactory.TestingFramework/Generated/Models/SftpWriteSettings.cs
index aaceea64..f8d22984 100644
--- a/src/AzureDataFactory.TestingFramework/Generated/Models/SftpWriteSettings.cs
+++ b/src/AzureDataFactory.TestingFramework/Generated/Models/SftpWriteSettings.cs
@@ -26,7 +26,7 @@ public SftpWriteSettings()
         /// <param name="additionalProperties"> Additional Properties. </param>
         /// <param name="operationTimeout"> Specifies the timeout for writing each chunk to SFTP server. Default value: 01:00:00 (one hour). Type: string (or Expression with resultType string). </param>
         /// <param name="useTempFileRename"> Upload to temporary file(s) and rename. Disable this option if your SFTP server doesn't support rename operation. Type: boolean (or Expression with resultType boolean). </param>
-        internal SftpWriteSettings(string storeWriteSettingsType, DataFactoryElement<int> maxConcurrentConnections, DataFactoryElement<bool> disableMetricsCollection, BinaryData copyBehavior, IDictionary<string, BinaryData> additionalProperties, DataFactoryElement<string> operationTimeout, DataFactoryElement<bool> useTempFileRename) : base(storeWriteSettingsType, maxConcurrentConnections, disableMetricsCollection, copyBehavior, additionalProperties)
+        internal SftpWriteSettings(string storeWriteSettingsType, DataFactoryElement<int> maxConcurrentConnections, DataFactoryElement<bool> disableMetricsCollection, BinaryData copyBehavior, IDictionary<string, DataFactoryElement<string>> additionalProperties, DataFactoryElement<string> operationTimeout, DataFactoryElement<bool> useTempFileRename) : base(storeWriteSettingsType, maxConcurrentConnections, disableMetricsCollection, copyBehavior, additionalProperties)
         {
             OperationTimeout = operationTimeout;
             UseTempFileRename = useTempFileRename;
diff --git a/src/AzureDataFactory.TestingFramework/Generated/Models/SharePointOnlineListLinkedService.Serialization.cs b/src/AzureDataFactory.TestingFramework/Generated/Models/SharePointOnlineListLinkedService.Serialization.cs
index 3d17c83d..dc93e2db 100644
--- a/src/AzureDataFactory.TestingFramework/Generated/Models/SharePointOnlineListLinkedService.Serialization.cs
+++ b/src/AzureDataFactory.TestingFramework/Generated/Models/SharePointOnlineListLinkedService.Serialization.cs
@@ -101,8 +101,8 @@ internal static SharePointOnlineListLinkedService DeserializeSharePointOnlineLis
             DataFactoryElement<string> servicePrincipalId = default;
             DataFactorySecretBaseDefinition servicePrincipalKey = default;
             Optional<string> encryptedCredential = default;
-            IDictionary<string, BinaryData> additionalProperties = default;
-            Dictionary<string, BinaryData> additionalPropertiesDictionary = new Dictionary<string, BinaryData>();
+            IDictionary<string, DataFactoryElement<string>> additionalProperties = default;
+            Dictionary<string, DataFactoryElement<string>> additionalPropertiesDictionary = new Dictionary<string, DataFactoryElement<string>>();
             foreach (var property in element.EnumerateObject())
             {
                 if (property.NameEquals("type"u8))
@@ -196,7 +196,7 @@ internal static SharePointOnlineListLinkedService DeserializeSharePointOnlineLis
                     }
                     continue;
                 }
-                additionalPropertiesDictionary.Add(property.Name, BinaryData.FromString(property.Value.GetRawText()));
+                additionalPropertiesDictionary.Add(property.Name, JsonSerializer.Deserialize<DataFactoryElement<string>>(property.Value.GetRawText()));
             }
             additionalProperties = additionalPropertiesDictionary;
             return new SharePointOnlineListLinkedService(type, connectVia.Value, description.Value, Optional.ToDictionary(parameters), Optional.ToList(annotations), additionalProperties, siteUrl, tenantId, servicePrincipalId, servicePrincipalKey, encryptedCredential.Value);
diff --git a/src/AzureDataFactory.TestingFramework/Generated/Models/SharePointOnlineListLinkedService.cs b/src/AzureDataFactory.TestingFramework/Generated/Models/SharePointOnlineListLinkedService.cs
index 71abf0d6..722c668b 100644
--- a/src/AzureDataFactory.TestingFramework/Generated/Models/SharePointOnlineListLinkedService.cs
+++ b/src/AzureDataFactory.TestingFramework/Generated/Models/SharePointOnlineListLinkedService.cs
@@ -45,7 +45,7 @@ public SharePointOnlineListLinkedService(DataFactoryElement<string> siteUri, Dat
         /// <param name="servicePrincipalId"> The application (client) ID of your application registered in Azure Active Directory. Make sure to grant SharePoint site permission to this application. Type: string (or Expression with resultType string). </param>
         /// <param name="servicePrincipalKey"> The client secret of your application registered in Azure Active Directory. Type: string (or Expression with resultType string). </param>
         /// <param name="encryptedCredential"> The encrypted credential used for authentication. Credentials are encrypted using the integration runtime credential manager. Type: string. </param>
-        internal SharePointOnlineListLinkedService(string linkedServiceType, IntegrationRuntimeReference connectVia, string description, IDictionary<string, EntityParameterSpecification> parameters, IList<BinaryData> annotations, IDictionary<string, BinaryData> additionalProperties, DataFactoryElement<string> siteUri, DataFactoryElement<string> tenantId, DataFactoryElement<string> servicePrincipalId, DataFactorySecretBaseDefinition servicePrincipalKey, string encryptedCredential) : base(linkedServiceType, connectVia, description, parameters, annotations, additionalProperties)
+        internal SharePointOnlineListLinkedService(string linkedServiceType, IntegrationRuntimeReference connectVia, string description, IDictionary<string, EntityParameterSpecification> parameters, IList<BinaryData> annotations, IDictionary<string, DataFactoryElement<string>> additionalProperties, DataFactoryElement<string> siteUri, DataFactoryElement<string> tenantId, DataFactoryElement<string> servicePrincipalId, DataFactorySecretBaseDefinition servicePrincipalKey, string encryptedCredential) : base(linkedServiceType, connectVia, description, parameters, annotations, additionalProperties)
         {
             SiteUri = siteUri;
             TenantId = tenantId;
diff --git a/src/AzureDataFactory.TestingFramework/Generated/Models/SharePointOnlineListResourceDataset.Serialization.cs b/src/AzureDataFactory.TestingFramework/Generated/Models/SharePointOnlineListResourceDataset.Serialization.cs
index 654e4416..f7cecec4 100644
--- a/src/AzureDataFactory.TestingFramework/Generated/Models/SharePointOnlineListResourceDataset.Serialization.cs
+++ b/src/AzureDataFactory.TestingFramework/Generated/Models/SharePointOnlineListResourceDataset.Serialization.cs
@@ -104,8 +104,8 @@ internal static SharePointOnlineListResourceDataset DeserializeSharePointOnlineL
             Optional<IList<BinaryData>> annotations = default;
             Optional<DatasetFolder> folder = default;
             Optional<DataFactoryElement<string>> listName = default;
-            IDictionary<string, BinaryData> additionalProperties = default;
-            Dictionary<string, BinaryData> additionalPropertiesDictionary = new Dictionary<string, BinaryData>();
+            IDictionary<string, DataFactoryElement<string>> additionalProperties = default;
+            Dictionary<string, DataFactoryElement<string>> additionalPropertiesDictionary = new Dictionary<string, DataFactoryElement<string>>();
             foreach (var property in element.EnumerateObject())
             {
                 if (property.NameEquals("type"u8))
@@ -206,7 +206,7 @@ internal static SharePointOnlineListResourceDataset DeserializeSharePointOnlineL
                     }
                     continue;
                 }
-                additionalPropertiesDictionary.Add(property.Name, BinaryData.FromString(property.Value.GetRawText()));
+                additionalPropertiesDictionary.Add(property.Name, JsonSerializer.Deserialize<DataFactoryElement<string>>(property.Value.GetRawText()));
             }
             additionalProperties = additionalPropertiesDictionary;
             return new SharePointOnlineListResourceDataset(type, description.Value, structure.Value, schema.Value, linkedServiceName, Optional.ToDictionary(parameters), Optional.ToList(annotations), folder.Value, additionalProperties, listName.Value);
diff --git a/src/AzureDataFactory.TestingFramework/Generated/Models/SharePointOnlineListResourceDataset.cs b/src/AzureDataFactory.TestingFramework/Generated/Models/SharePointOnlineListResourceDataset.cs
index 213e3074..1b4f71fa 100644
--- a/src/AzureDataFactory.TestingFramework/Generated/Models/SharePointOnlineListResourceDataset.cs
+++ b/src/AzureDataFactory.TestingFramework/Generated/Models/SharePointOnlineListResourceDataset.cs
@@ -34,7 +34,7 @@ public SharePointOnlineListResourceDataset(DataFactoryLinkedServiceReference lin
         /// <param name="folder"> The folder that this Dataset is in. If not specified, Dataset will appear at the root level. </param>
         /// <param name="additionalProperties"> Additional Properties. </param>
         /// <param name="listName"> The name of the SharePoint Online list. Type: string (or Expression with resultType string). </param>
-        internal SharePointOnlineListResourceDataset(string datasetType, string description, DataFactoryElement<IList<DatasetDataElement>> structure, DataFactoryElement<IList<DatasetSchemaDataElement>> schema, DataFactoryLinkedServiceReference linkedServiceName, IDictionary<string, EntityParameterSpecification> parameters, IList<BinaryData> annotations, DatasetFolder folder, IDictionary<string, BinaryData> additionalProperties, DataFactoryElement<string> listName) : base(datasetType, description, structure, schema, linkedServiceName, parameters, annotations, folder, additionalProperties)
+        internal SharePointOnlineListResourceDataset(string datasetType, string description, DataFactoryElement<IList<DatasetDataElement>> structure, DataFactoryElement<IList<DatasetSchemaDataElement>> schema, DataFactoryLinkedServiceReference linkedServiceName, IDictionary<string, EntityParameterSpecification> parameters, IList<BinaryData> annotations, DatasetFolder folder, IDictionary<string, DataFactoryElement<string>> additionalProperties, DataFactoryElement<string> listName) : base(datasetType, description, structure, schema, linkedServiceName, parameters, annotations, folder, additionalProperties)
         {
             ListName = listName;
             DatasetType = datasetType ?? "SharePointOnlineListResource";
diff --git a/src/AzureDataFactory.TestingFramework/Generated/Models/SharePointOnlineListSource.Serialization.cs b/src/AzureDataFactory.TestingFramework/Generated/Models/SharePointOnlineListSource.Serialization.cs
index 9a0da63c..1233bdef 100644
--- a/src/AzureDataFactory.TestingFramework/Generated/Models/SharePointOnlineListSource.Serialization.cs
+++ b/src/AzureDataFactory.TestingFramework/Generated/Models/SharePointOnlineListSource.Serialization.cs
@@ -73,8 +73,8 @@ internal static SharePointOnlineListSource DeserializeSharePointOnlineListSource
             Optional<DataFactoryElement<string>> sourceRetryWait = default;
             Optional<DataFactoryElement<int>> maxConcurrentConnections = default;
             Optional<DataFactoryElement<bool>> disableMetricsCollection = default;
-            IDictionary<string, BinaryData> additionalProperties = default;
-            Dictionary<string, BinaryData> additionalPropertiesDictionary = new Dictionary<string, BinaryData>();
+            IDictionary<string, DataFactoryElement<string>> additionalProperties = default;
+            Dictionary<string, DataFactoryElement<string>> additionalPropertiesDictionary = new Dictionary<string, DataFactoryElement<string>>();
             foreach (var property in element.EnumerateObject())
             {
                 if (property.NameEquals("query"u8))
@@ -136,7 +136,7 @@ internal static SharePointOnlineListSource DeserializeSharePointOnlineListSource
                     disableMetricsCollection = JsonSerializer.Deserialize<DataFactoryElement<bool>>(property.Value.GetRawText());
                     continue;
                 }
-                additionalPropertiesDictionary.Add(property.Name, BinaryData.FromString(property.Value.GetRawText()));
+                additionalPropertiesDictionary.Add(property.Name, JsonSerializer.Deserialize<DataFactoryElement<string>>(property.Value.GetRawText()));
             }
             additionalProperties = additionalPropertiesDictionary;
             return new SharePointOnlineListSource(type, sourceRetryCount.Value, sourceRetryWait.Value, maxConcurrentConnections.Value, disableMetricsCollection.Value, additionalProperties, query.Value, httpRequestTimeout.Value);
diff --git a/src/AzureDataFactory.TestingFramework/Generated/Models/SharePointOnlineListSource.cs b/src/AzureDataFactory.TestingFramework/Generated/Models/SharePointOnlineListSource.cs
index b852516a..ea51a09f 100644
--- a/src/AzureDataFactory.TestingFramework/Generated/Models/SharePointOnlineListSource.cs
+++ b/src/AzureDataFactory.TestingFramework/Generated/Models/SharePointOnlineListSource.cs
@@ -27,7 +27,7 @@ public SharePointOnlineListSource()
         /// <param name="additionalProperties"> Additional Properties. </param>
         /// <param name="query"> The OData query to filter the data in SharePoint Online list. For example, "$top=1". Type: string (or Expression with resultType string). </param>
         /// <param name="httpRequestTimeout"> The wait time to get a response from SharePoint Online. Default value is 5 minutes (00:05:00). Type: string (or Expression with resultType string), pattern: ((\d+)\.)?(\d\d):(60|([0-5][0-9])):(60|([0-5][0-9])). </param>
-        internal SharePointOnlineListSource(string copySourceType, DataFactoryElement<int> sourceRetryCount, DataFactoryElement<string> sourceRetryWait, DataFactoryElement<int> maxConcurrentConnections, DataFactoryElement<bool> disableMetricsCollection, IDictionary<string, BinaryData> additionalProperties, DataFactoryElement<string> query, DataFactoryElement<string> httpRequestTimeout) : base(copySourceType, sourceRetryCount, sourceRetryWait, maxConcurrentConnections, disableMetricsCollection, additionalProperties)
+        internal SharePointOnlineListSource(string copySourceType, DataFactoryElement<int> sourceRetryCount, DataFactoryElement<string> sourceRetryWait, DataFactoryElement<int> maxConcurrentConnections, DataFactoryElement<bool> disableMetricsCollection, IDictionary<string, DataFactoryElement<string>> additionalProperties, DataFactoryElement<string> query, DataFactoryElement<string> httpRequestTimeout) : base(copySourceType, sourceRetryCount, sourceRetryWait, maxConcurrentConnections, disableMetricsCollection, additionalProperties)
         {
             Query = query;
             HttpRequestTimeout = httpRequestTimeout;
diff --git a/src/AzureDataFactory.TestingFramework/Generated/Models/ShopifyLinkedService.Serialization.cs b/src/AzureDataFactory.TestingFramework/Generated/Models/ShopifyLinkedService.Serialization.cs
index 2ccbf340..4735adea 100644
--- a/src/AzureDataFactory.TestingFramework/Generated/Models/ShopifyLinkedService.Serialization.cs
+++ b/src/AzureDataFactory.TestingFramework/Generated/Models/ShopifyLinkedService.Serialization.cs
@@ -117,8 +117,8 @@ internal static ShopifyLinkedService DeserializeShopifyLinkedService(JsonElement
             Optional<DataFactoryElement<bool>> useHostVerification = default;
             Optional<DataFactoryElement<bool>> usePeerVerification = default;
             Optional<string> encryptedCredential = default;
-            IDictionary<string, BinaryData> additionalProperties = default;
-            Dictionary<string, BinaryData> additionalPropertiesDictionary = new Dictionary<string, BinaryData>();
+            IDictionary<string, DataFactoryElement<string>> additionalProperties = default;
+            Dictionary<string, DataFactoryElement<string>> additionalPropertiesDictionary = new Dictionary<string, DataFactoryElement<string>>();
             foreach (var property in element.EnumerateObject())
             {
                 if (property.NameEquals("type"u8))
@@ -233,7 +233,7 @@ internal static ShopifyLinkedService DeserializeShopifyLinkedService(JsonElement
                     }
                     continue;
                 }
-                additionalPropertiesDictionary.Add(property.Name, BinaryData.FromString(property.Value.GetRawText()));
+                additionalPropertiesDictionary.Add(property.Name, JsonSerializer.Deserialize<DataFactoryElement<string>>(property.Value.GetRawText()));
             }
             additionalProperties = additionalPropertiesDictionary;
             return new ShopifyLinkedService(type, connectVia.Value, description.Value, Optional.ToDictionary(parameters), Optional.ToList(annotations), additionalProperties, host, accessToken, useEncryptedEndpoints.Value, useHostVerification.Value, usePeerVerification.Value, encryptedCredential.Value);
diff --git a/src/AzureDataFactory.TestingFramework/Generated/Models/ShopifyLinkedService.cs b/src/AzureDataFactory.TestingFramework/Generated/Models/ShopifyLinkedService.cs
index 6f01fc6e..48f7c278 100644
--- a/src/AzureDataFactory.TestingFramework/Generated/Models/ShopifyLinkedService.cs
+++ b/src/AzureDataFactory.TestingFramework/Generated/Models/ShopifyLinkedService.cs
@@ -37,7 +37,7 @@ public ShopifyLinkedService(DataFactoryElement<string> host)
         /// <param name="useHostVerification"> Specifies whether to require the host name in the server's certificate to match the host name of the server when connecting over SSL. The default value is true. </param>
         /// <param name="usePeerVerification"> Specifies whether to verify the identity of the server when connecting over SSL. The default value is true. </param>
         /// <param name="encryptedCredential"> The encrypted credential used for authentication. Credentials are encrypted using the integration runtime credential manager. Type: string. </param>
-        internal ShopifyLinkedService(string linkedServiceType, IntegrationRuntimeReference connectVia, string description, IDictionary<string, EntityParameterSpecification> parameters, IList<BinaryData> annotations, IDictionary<string, BinaryData> additionalProperties, DataFactoryElement<string> host, DataFactorySecretBaseDefinition accessToken, DataFactoryElement<bool> useEncryptedEndpoints, DataFactoryElement<bool> useHostVerification, DataFactoryElement<bool> usePeerVerification, string encryptedCredential) : base(linkedServiceType, connectVia, description, parameters, annotations, additionalProperties)
+        internal ShopifyLinkedService(string linkedServiceType, IntegrationRuntimeReference connectVia, string description, IDictionary<string, EntityParameterSpecification> parameters, IList<BinaryData> annotations, IDictionary<string, DataFactoryElement<string>> additionalProperties, DataFactoryElement<string> host, DataFactorySecretBaseDefinition accessToken, DataFactoryElement<bool> useEncryptedEndpoints, DataFactoryElement<bool> useHostVerification, DataFactoryElement<bool> usePeerVerification, string encryptedCredential) : base(linkedServiceType, connectVia, description, parameters, annotations, additionalProperties)
         {
             Host = host;
             AccessToken = accessToken;
diff --git a/src/AzureDataFactory.TestingFramework/Generated/Models/ShopifyObjectDataset.Serialization.cs b/src/AzureDataFactory.TestingFramework/Generated/Models/ShopifyObjectDataset.Serialization.cs
index e2c44b70..99536845 100644
--- a/src/AzureDataFactory.TestingFramework/Generated/Models/ShopifyObjectDataset.Serialization.cs
+++ b/src/AzureDataFactory.TestingFramework/Generated/Models/ShopifyObjectDataset.Serialization.cs
@@ -104,8 +104,8 @@ internal static ShopifyObjectDataset DeserializeShopifyObjectDataset(JsonElement
             Optional<IList<BinaryData>> annotations = default;
             Optional<DatasetFolder> folder = default;
             Optional<DataFactoryElement<string>> tableName = default;
-            IDictionary<string, BinaryData> additionalProperties = default;
-            Dictionary<string, BinaryData> additionalPropertiesDictionary = new Dictionary<string, BinaryData>();
+            IDictionary<string, DataFactoryElement<string>> additionalProperties = default;
+            Dictionary<string, DataFactoryElement<string>> additionalPropertiesDictionary = new Dictionary<string, DataFactoryElement<string>>();
             foreach (var property in element.EnumerateObject())
             {
                 if (property.NameEquals("type"u8))
@@ -206,7 +206,7 @@ internal static ShopifyObjectDataset DeserializeShopifyObjectDataset(JsonElement
                     }
                     continue;
                 }
-                additionalPropertiesDictionary.Add(property.Name, BinaryData.FromString(property.Value.GetRawText()));
+                additionalPropertiesDictionary.Add(property.Name, JsonSerializer.Deserialize<DataFactoryElement<string>>(property.Value.GetRawText()));
             }
             additionalProperties = additionalPropertiesDictionary;
             return new ShopifyObjectDataset(type, description.Value, structure.Value, schema.Value, linkedServiceName, Optional.ToDictionary(parameters), Optional.ToList(annotations), folder.Value, additionalProperties, tableName.Value);
diff --git a/src/AzureDataFactory.TestingFramework/Generated/Models/ShopifyObjectDataset.cs b/src/AzureDataFactory.TestingFramework/Generated/Models/ShopifyObjectDataset.cs
index abc572ed..d13b145f 100644
--- a/src/AzureDataFactory.TestingFramework/Generated/Models/ShopifyObjectDataset.cs
+++ b/src/AzureDataFactory.TestingFramework/Generated/Models/ShopifyObjectDataset.cs
@@ -34,7 +34,7 @@ public ShopifyObjectDataset(DataFactoryLinkedServiceReference linkedServiceName)
         /// <param name="folder"> The folder that this Dataset is in. If not specified, Dataset will appear at the root level. </param>
         /// <param name="additionalProperties"> Additional Properties. </param>
         /// <param name="tableName"> The table name. Type: string (or Expression with resultType string). </param>
-        internal ShopifyObjectDataset(string datasetType, string description, DataFactoryElement<IList<DatasetDataElement>> structure, DataFactoryElement<IList<DatasetSchemaDataElement>> schema, DataFactoryLinkedServiceReference linkedServiceName, IDictionary<string, EntityParameterSpecification> parameters, IList<BinaryData> annotations, DatasetFolder folder, IDictionary<string, BinaryData> additionalProperties, DataFactoryElement<string> tableName) : base(datasetType, description, structure, schema, linkedServiceName, parameters, annotations, folder, additionalProperties)
+        internal ShopifyObjectDataset(string datasetType, string description, DataFactoryElement<IList<DatasetDataElement>> structure, DataFactoryElement<IList<DatasetSchemaDataElement>> schema, DataFactoryLinkedServiceReference linkedServiceName, IDictionary<string, EntityParameterSpecification> parameters, IList<BinaryData> annotations, DatasetFolder folder, IDictionary<string, DataFactoryElement<string>> additionalProperties, DataFactoryElement<string> tableName) : base(datasetType, description, structure, schema, linkedServiceName, parameters, annotations, folder, additionalProperties)
         {
             TableName = tableName;
             DatasetType = datasetType ?? "ShopifyObject";
diff --git a/src/AzureDataFactory.TestingFramework/Generated/Models/ShopifySource.Serialization.cs b/src/AzureDataFactory.TestingFramework/Generated/Models/ShopifySource.Serialization.cs
index 1f87ad9a..1c835041 100644
--- a/src/AzureDataFactory.TestingFramework/Generated/Models/ShopifySource.Serialization.cs
+++ b/src/AzureDataFactory.TestingFramework/Generated/Models/ShopifySource.Serialization.cs
@@ -83,8 +83,8 @@ internal static ShopifySource DeserializeShopifySource(JsonElement element)
             Optional<DataFactoryElement<string>> sourceRetryWait = default;
             Optional<DataFactoryElement<int>> maxConcurrentConnections = default;
             Optional<DataFactoryElement<bool>> disableMetricsCollection = default;
-            IDictionary<string, BinaryData> additionalProperties = default;
-            Dictionary<string, BinaryData> additionalPropertiesDictionary = new Dictionary<string, BinaryData>();
+            IDictionary<string, DataFactoryElement<string>> additionalProperties = default;
+            Dictionary<string, DataFactoryElement<string>> additionalPropertiesDictionary = new Dictionary<string, DataFactoryElement<string>>();
             foreach (var property in element.EnumerateObject())
             {
                 if (property.NameEquals("query"u8))
@@ -155,7 +155,7 @@ internal static ShopifySource DeserializeShopifySource(JsonElement element)
                     disableMetricsCollection = JsonSerializer.Deserialize<DataFactoryElement<bool>>(property.Value.GetRawText());
                     continue;
                 }
-                additionalPropertiesDictionary.Add(property.Name, BinaryData.FromString(property.Value.GetRawText()));
+                additionalPropertiesDictionary.Add(property.Name, JsonSerializer.Deserialize<DataFactoryElement<string>>(property.Value.GetRawText()));
             }
             additionalProperties = additionalPropertiesDictionary;
             return new ShopifySource(type, sourceRetryCount.Value, sourceRetryWait.Value, maxConcurrentConnections.Value, disableMetricsCollection.Value, additionalProperties, queryTimeout.Value, additionalColumns.Value, query.Value);
diff --git a/src/AzureDataFactory.TestingFramework/Generated/Models/ShopifySource.cs b/src/AzureDataFactory.TestingFramework/Generated/Models/ShopifySource.cs
index ebf1ba31..6d90df84 100644
--- a/src/AzureDataFactory.TestingFramework/Generated/Models/ShopifySource.cs
+++ b/src/AzureDataFactory.TestingFramework/Generated/Models/ShopifySource.cs
@@ -28,7 +28,7 @@ public ShopifySource()
         /// <param name="queryTimeout"> Query timeout. Type: string (or Expression with resultType string), pattern: ((\d+)\.)?(\d\d):(60|([0-5][0-9])):(60|([0-5][0-9])). </param>
         /// <param name="additionalColumns"> Specifies the additional columns to be added to source data. Type: array of objects(AdditionalColumns) (or Expression with resultType array of objects). </param>
         /// <param name="query"> A query to retrieve data from source. Type: string (or Expression with resultType string). </param>
-        internal ShopifySource(string copySourceType, DataFactoryElement<int> sourceRetryCount, DataFactoryElement<string> sourceRetryWait, DataFactoryElement<int> maxConcurrentConnections, DataFactoryElement<bool> disableMetricsCollection, IDictionary<string, BinaryData> additionalProperties, DataFactoryElement<string> queryTimeout, BinaryData additionalColumns, DataFactoryElement<string> query) : base(copySourceType, sourceRetryCount, sourceRetryWait, maxConcurrentConnections, disableMetricsCollection, additionalProperties, queryTimeout, additionalColumns)
+        internal ShopifySource(string copySourceType, DataFactoryElement<int> sourceRetryCount, DataFactoryElement<string> sourceRetryWait, DataFactoryElement<int> maxConcurrentConnections, DataFactoryElement<bool> disableMetricsCollection, IDictionary<string, DataFactoryElement<string>> additionalProperties, DataFactoryElement<string> queryTimeout, BinaryData additionalColumns, DataFactoryElement<string> query) : base(copySourceType, sourceRetryCount, sourceRetryWait, maxConcurrentConnections, disableMetricsCollection, additionalProperties, queryTimeout, additionalColumns)
         {
             Query = query;
             CopySourceType = copySourceType ?? "ShopifySource";
diff --git a/src/AzureDataFactory.TestingFramework/Generated/Models/SmartsheetLinkedService.Serialization.cs b/src/AzureDataFactory.TestingFramework/Generated/Models/SmartsheetLinkedService.Serialization.cs
index 1431e74f..3072c5ed 100644
--- a/src/AzureDataFactory.TestingFramework/Generated/Models/SmartsheetLinkedService.Serialization.cs
+++ b/src/AzureDataFactory.TestingFramework/Generated/Models/SmartsheetLinkedService.Serialization.cs
@@ -92,8 +92,8 @@ internal static SmartsheetLinkedService DeserializeSmartsheetLinkedService(JsonE
             Optional<IList<BinaryData>> annotations = default;
             DataFactorySecretBaseDefinition apiToken = default;
             Optional<string> encryptedCredential = default;
-            IDictionary<string, BinaryData> additionalProperties = default;
-            Dictionary<string, BinaryData> additionalPropertiesDictionary = new Dictionary<string, BinaryData>();
+            IDictionary<string, DataFactoryElement<string>> additionalProperties = default;
+            Dictionary<string, DataFactoryElement<string>> additionalPropertiesDictionary = new Dictionary<string, DataFactoryElement<string>>();
             foreach (var property in element.EnumerateObject())
             {
                 if (property.NameEquals("type"u8))
@@ -172,7 +172,7 @@ internal static SmartsheetLinkedService DeserializeSmartsheetLinkedService(JsonE
                     }
                     continue;
                 }
-                additionalPropertiesDictionary.Add(property.Name, BinaryData.FromString(property.Value.GetRawText()));
+                additionalPropertiesDictionary.Add(property.Name, JsonSerializer.Deserialize<DataFactoryElement<string>>(property.Value.GetRawText()));
             }
             additionalProperties = additionalPropertiesDictionary;
             return new SmartsheetLinkedService(type, connectVia.Value, description.Value, Optional.ToDictionary(parameters), Optional.ToList(annotations), additionalProperties, apiToken, encryptedCredential.Value);
diff --git a/src/AzureDataFactory.TestingFramework/Generated/Models/SmartsheetLinkedService.cs b/src/AzureDataFactory.TestingFramework/Generated/Models/SmartsheetLinkedService.cs
index fc0c682b..ce209353 100644
--- a/src/AzureDataFactory.TestingFramework/Generated/Models/SmartsheetLinkedService.cs
+++ b/src/AzureDataFactory.TestingFramework/Generated/Models/SmartsheetLinkedService.cs
@@ -33,7 +33,7 @@ public SmartsheetLinkedService(DataFactorySecretBaseDefinition apiToken)
         /// <param name="additionalProperties"> Additional Properties. </param>
         /// <param name="apiToken"> The api token for the Smartsheet source. </param>
         /// <param name="encryptedCredential"> The encrypted credential used for authentication. Credentials are encrypted using the integration runtime credential manager. Type: string. </param>
-        internal SmartsheetLinkedService(string linkedServiceType, IntegrationRuntimeReference connectVia, string description, IDictionary<string, EntityParameterSpecification> parameters, IList<BinaryData> annotations, IDictionary<string, BinaryData> additionalProperties, DataFactorySecretBaseDefinition apiToken, string encryptedCredential) : base(linkedServiceType, connectVia, description, parameters, annotations, additionalProperties)
+        internal SmartsheetLinkedService(string linkedServiceType, IntegrationRuntimeReference connectVia, string description, IDictionary<string, EntityParameterSpecification> parameters, IList<BinaryData> annotations, IDictionary<string, DataFactoryElement<string>> additionalProperties, DataFactorySecretBaseDefinition apiToken, string encryptedCredential) : base(linkedServiceType, connectVia, description, parameters, annotations, additionalProperties)
         {
             ApiToken = apiToken;
             EncryptedCredential = encryptedCredential;
diff --git a/src/AzureDataFactory.TestingFramework/Generated/Models/SnowflakeDataset.Serialization.cs b/src/AzureDataFactory.TestingFramework/Generated/Models/SnowflakeDataset.Serialization.cs
index 17ff7ddb..3d4aadd8 100644
--- a/src/AzureDataFactory.TestingFramework/Generated/Models/SnowflakeDataset.Serialization.cs
+++ b/src/AzureDataFactory.TestingFramework/Generated/Models/SnowflakeDataset.Serialization.cs
@@ -110,8 +110,8 @@ internal static SnowflakeDataset DeserializeSnowflakeDataset(JsonElement element
             Optional<DatasetFolder> folder = default;
             Optional<DataFactoryElement<string>> schema0 = default;
             Optional<DataFactoryElement<string>> table = default;
-            IDictionary<string, BinaryData> additionalProperties = default;
-            Dictionary<string, BinaryData> additionalPropertiesDictionary = new Dictionary<string, BinaryData>();
+            IDictionary<string, DataFactoryElement<string>> additionalProperties = default;
+            Dictionary<string, DataFactoryElement<string>> additionalPropertiesDictionary = new Dictionary<string, DataFactoryElement<string>>();
             foreach (var property in element.EnumerateObject())
             {
                 if (property.NameEquals("type"u8))
@@ -221,7 +221,7 @@ internal static SnowflakeDataset DeserializeSnowflakeDataset(JsonElement element
                     }
                     continue;
                 }
-                additionalPropertiesDictionary.Add(property.Name, BinaryData.FromString(property.Value.GetRawText()));
+                additionalPropertiesDictionary.Add(property.Name, JsonSerializer.Deserialize<DataFactoryElement<string>>(property.Value.GetRawText()));
             }
             additionalProperties = additionalPropertiesDictionary;
             return new SnowflakeDataset(type, description.Value, structure.Value, schema.Value, linkedServiceName, Optional.ToDictionary(parameters), Optional.ToList(annotations), folder.Value, additionalProperties, schema0.Value, table.Value);
diff --git a/src/AzureDataFactory.TestingFramework/Generated/Models/SnowflakeDataset.cs b/src/AzureDataFactory.TestingFramework/Generated/Models/SnowflakeDataset.cs
index bce6bbc8..9544d8e0 100644
--- a/src/AzureDataFactory.TestingFramework/Generated/Models/SnowflakeDataset.cs
+++ b/src/AzureDataFactory.TestingFramework/Generated/Models/SnowflakeDataset.cs
@@ -35,7 +35,7 @@ public SnowflakeDataset(DataFactoryLinkedServiceReference linkedServiceName) : b
         /// <param name="additionalProperties"> Additional Properties. </param>
         /// <param name="schemaTypePropertiesSchema"> The schema name of the Snowflake database. Type: string (or Expression with resultType string). </param>
         /// <param name="table"> The table name of the Snowflake database. Type: string (or Expression with resultType string). </param>
-        internal SnowflakeDataset(string datasetType, string description, DataFactoryElement<IList<DatasetDataElement>> structure, DataFactoryElement<IList<DatasetSchemaDataElement>> schema, DataFactoryLinkedServiceReference linkedServiceName, IDictionary<string, EntityParameterSpecification> parameters, IList<BinaryData> annotations, DatasetFolder folder, IDictionary<string, BinaryData> additionalProperties, DataFactoryElement<string> schemaTypePropertiesSchema, DataFactoryElement<string> table) : base(datasetType, description, structure, schema, linkedServiceName, parameters, annotations, folder, additionalProperties)
+        internal SnowflakeDataset(string datasetType, string description, DataFactoryElement<IList<DatasetDataElement>> structure, DataFactoryElement<IList<DatasetSchemaDataElement>> schema, DataFactoryLinkedServiceReference linkedServiceName, IDictionary<string, EntityParameterSpecification> parameters, IList<BinaryData> annotations, DatasetFolder folder, IDictionary<string, DataFactoryElement<string>> additionalProperties, DataFactoryElement<string> schemaTypePropertiesSchema, DataFactoryElement<string> table) : base(datasetType, description, structure, schema, linkedServiceName, parameters, annotations, folder, additionalProperties)
         {
             SchemaTypePropertiesSchema = schemaTypePropertiesSchema;
             Table = table;
diff --git a/src/AzureDataFactory.TestingFramework/Generated/Models/SnowflakeExportCopyCommand.Serialization.cs b/src/AzureDataFactory.TestingFramework/Generated/Models/SnowflakeExportCopyCommand.Serialization.cs
index 94f220dd..fcade7e9 100644
--- a/src/AzureDataFactory.TestingFramework/Generated/Models/SnowflakeExportCopyCommand.Serialization.cs
+++ b/src/AzureDataFactory.TestingFramework/Generated/Models/SnowflakeExportCopyCommand.Serialization.cs
@@ -7,6 +7,7 @@
 
 using System.Text.Json;
 using Azure.Core;
+using Azure.Core.Expressions.DataFactory;
 
 namespace AzureDataFactory.TestingFramework.Models
 {
@@ -75,11 +76,11 @@ internal static SnowflakeExportCopyCommand DeserializeSnowflakeExportCopyCommand
             {
                 return null;
             }
-            Optional<IDictionary<string, BinaryData>> additionalCopyOptions = default;
-            Optional<IDictionary<string, BinaryData>> additionalFormatOptions = default;
+            Optional<IDictionary<string, DataFactoryElement<string>>> additionalCopyOptions = default;
+            Optional<IDictionary<string, DataFactoryElement<string>>> additionalFormatOptions = default;
             string type = default;
-            IDictionary<string, BinaryData> additionalProperties = default;
-            Dictionary<string, BinaryData> additionalPropertiesDictionary = new Dictionary<string, BinaryData>();
+            IDictionary<string, DataFactoryElement<string>> additionalProperties = default;
+            Dictionary<string, DataFactoryElement<string>> additionalPropertiesDictionary = new Dictionary<string, DataFactoryElement<string>>();
             foreach (var property in element.EnumerateObject())
             {
                 if (property.NameEquals("additionalCopyOptions"u8))
@@ -88,7 +89,7 @@ internal static SnowflakeExportCopyCommand DeserializeSnowflakeExportCopyCommand
                     {
                         continue;
                     }
-                    Dictionary<string, BinaryData> dictionary = new Dictionary<string, BinaryData>();
+                    Dictionary<string, DataFactoryElement<string>> dictionary = new Dictionary<string, DataFactoryElement<string>>();
                     foreach (var property0 in property.Value.EnumerateObject())
                     {
                         if (property0.Value.ValueKind == JsonValueKind.Null)
@@ -97,7 +98,7 @@ internal static SnowflakeExportCopyCommand DeserializeSnowflakeExportCopyCommand
                         }
                         else
                         {
-                            dictionary.Add(property0.Name, BinaryData.FromString(property0.Value.GetRawText()));
+                            dictionary.Add(property0.Name, JsonSerializer.Deserialize<DataFactoryElement<string>>(property0.Value.GetRawText()));
                         }
                     }
                     additionalCopyOptions = dictionary;
@@ -109,7 +110,7 @@ internal static SnowflakeExportCopyCommand DeserializeSnowflakeExportCopyCommand
                     {
                         continue;
                     }
-                    Dictionary<string, BinaryData> dictionary = new Dictionary<string, BinaryData>();
+                    Dictionary<string, DataFactoryElement<string>> dictionary = new Dictionary<string, DataFactoryElement<string>>();
                     foreach (var property0 in property.Value.EnumerateObject())
                     {
                         if (property0.Value.ValueKind == JsonValueKind.Null)
@@ -118,7 +119,7 @@ internal static SnowflakeExportCopyCommand DeserializeSnowflakeExportCopyCommand
                         }
                         else
                         {
-                            dictionary.Add(property0.Name, BinaryData.FromString(property0.Value.GetRawText()));
+                            dictionary.Add(property0.Name, JsonSerializer.Deserialize<DataFactoryElement<string>>(property0.Value.GetRawText()));
                         }
                     }
                     additionalFormatOptions = dictionary;
@@ -129,7 +130,7 @@ internal static SnowflakeExportCopyCommand DeserializeSnowflakeExportCopyCommand
                     type = property.Value.GetString();
                     continue;
                 }
-                additionalPropertiesDictionary.Add(property.Name, BinaryData.FromString(property.Value.GetRawText()));
+                additionalPropertiesDictionary.Add(property.Name, JsonSerializer.Deserialize<DataFactoryElement<string>>(property.Value.GetRawText()));
             }
             additionalProperties = additionalPropertiesDictionary;
             return new SnowflakeExportCopyCommand(type, additionalProperties, Optional.ToDictionary(additionalCopyOptions), Optional.ToDictionary(additionalFormatOptions));
diff --git a/src/AzureDataFactory.TestingFramework/Generated/Models/SnowflakeExportCopyCommand.cs b/src/AzureDataFactory.TestingFramework/Generated/Models/SnowflakeExportCopyCommand.cs
index 9cdc86e6..66291392 100644
--- a/src/AzureDataFactory.TestingFramework/Generated/Models/SnowflakeExportCopyCommand.cs
+++ b/src/AzureDataFactory.TestingFramework/Generated/Models/SnowflakeExportCopyCommand.cs
@@ -6,6 +6,7 @@
 #nullable disable
 
 using Azure.Core;
+using Azure.Core.Expressions.DataFactory;
 
 namespace AzureDataFactory.TestingFramework.Models
 {
@@ -15,8 +16,8 @@ public partial class SnowflakeExportCopyCommand : ExportSettings
         /// <summary> Initializes a new instance of SnowflakeExportCopyCommand. </summary>
         public SnowflakeExportCopyCommand()
         {
-            AdditionalCopyOptions = new ChangeTrackingDictionary<string, BinaryData>();
-            AdditionalFormatOptions = new ChangeTrackingDictionary<string, BinaryData>();
+            AdditionalCopyOptions = new ChangeTrackingDictionary<string, DataFactoryElement<string>>();
+            AdditionalFormatOptions = new ChangeTrackingDictionary<string, DataFactoryElement<string>>();
             ExportSettingsType = "SnowflakeExportCopyCommand";
         }
 
@@ -25,7 +26,7 @@ public SnowflakeExportCopyCommand()
         /// <param name="additionalProperties"> Additional Properties. </param>
         /// <param name="additionalCopyOptions"> Additional copy options directly passed to snowflake Copy Command. Type: key value pairs (value should be string type) (or Expression with resultType object). Example: "additionalCopyOptions": { "DATE_FORMAT": "MM/DD/YYYY", "TIME_FORMAT": "'HH24:MI:SS.FF'" }. </param>
         /// <param name="additionalFormatOptions"> Additional format options directly passed to snowflake Copy Command. Type: key value pairs (value should be string type) (or Expression with resultType object). Example: "additionalFormatOptions": { "OVERWRITE": "TRUE", "MAX_FILE_SIZE": "'FALSE'" }. </param>
-        internal SnowflakeExportCopyCommand(string exportSettingsType, IDictionary<string, BinaryData> additionalProperties, IDictionary<string, BinaryData> additionalCopyOptions, IDictionary<string, BinaryData> additionalFormatOptions) : base(exportSettingsType, additionalProperties)
+        internal SnowflakeExportCopyCommand(string exportSettingsType, IDictionary<string, DataFactoryElement<string>> additionalProperties, IDictionary<string, DataFactoryElement<string>> additionalCopyOptions, IDictionary<string, DataFactoryElement<string>> additionalFormatOptions) : base(exportSettingsType, additionalProperties)
         {
             AdditionalCopyOptions = additionalCopyOptions;
             AdditionalFormatOptions = additionalFormatOptions;
@@ -62,7 +63,7 @@ internal SnowflakeExportCopyCommand(string exportSettingsType, IDictionary<strin
         /// </list>
         /// </para>
         /// </summary>
-        public IDictionary<string, BinaryData> AdditionalCopyOptions { get; }
+        public IDictionary<string, DataFactoryElement<string>> AdditionalCopyOptions { get; }
         /// <summary>
         /// Additional format options directly passed to snowflake Copy Command. Type: key value pairs (value should be string type) (or Expression with resultType object). Example: "additionalFormatOptions": { "OVERWRITE": "TRUE", "MAX_FILE_SIZE": "'FALSE'" }
         /// <para>
@@ -93,6 +94,6 @@ internal SnowflakeExportCopyCommand(string exportSettingsType, IDictionary<strin
         /// </list>
         /// </para>
         /// </summary>
-        public IDictionary<string, BinaryData> AdditionalFormatOptions { get; }
+        public IDictionary<string, DataFactoryElement<string>> AdditionalFormatOptions { get; }
     }
 }
diff --git a/src/AzureDataFactory.TestingFramework/Generated/Models/SnowflakeImportCopyCommand.Serialization.cs b/src/AzureDataFactory.TestingFramework/Generated/Models/SnowflakeImportCopyCommand.Serialization.cs
index 20b9b7a1..0e269955 100644
--- a/src/AzureDataFactory.TestingFramework/Generated/Models/SnowflakeImportCopyCommand.Serialization.cs
+++ b/src/AzureDataFactory.TestingFramework/Generated/Models/SnowflakeImportCopyCommand.Serialization.cs
@@ -7,6 +7,7 @@
 
 using System.Text.Json;
 using Azure.Core;
+using Azure.Core.Expressions.DataFactory;
 
 namespace AzureDataFactory.TestingFramework.Models
 {
@@ -75,11 +76,11 @@ internal static SnowflakeImportCopyCommand DeserializeSnowflakeImportCopyCommand
             {
                 return null;
             }
-            Optional<IDictionary<string, BinaryData>> additionalCopyOptions = default;
-            Optional<IDictionary<string, BinaryData>> additionalFormatOptions = default;
+            Optional<IDictionary<string, DataFactoryElement<string>>> additionalCopyOptions = default;
+            Optional<IDictionary<string, DataFactoryElement<string>>> additionalFormatOptions = default;
             string type = default;
-            IDictionary<string, BinaryData> additionalProperties = default;
-            Dictionary<string, BinaryData> additionalPropertiesDictionary = new Dictionary<string, BinaryData>();
+            IDictionary<string, DataFactoryElement<string>> additionalProperties = default;
+            Dictionary<string, DataFactoryElement<string>> additionalPropertiesDictionary = new Dictionary<string, DataFactoryElement<string>>();
             foreach (var property in element.EnumerateObject())
             {
                 if (property.NameEquals("additionalCopyOptions"u8))
@@ -88,7 +89,7 @@ internal static SnowflakeImportCopyCommand DeserializeSnowflakeImportCopyCommand
                     {
                         continue;
                     }
-                    Dictionary<string, BinaryData> dictionary = new Dictionary<string, BinaryData>();
+                    Dictionary<string, DataFactoryElement<string>> dictionary = new Dictionary<string, DataFactoryElement<string>>();
                     foreach (var property0 in property.Value.EnumerateObject())
                     {
                         if (property0.Value.ValueKind == JsonValueKind.Null)
@@ -97,7 +98,7 @@ internal static SnowflakeImportCopyCommand DeserializeSnowflakeImportCopyCommand
                         }
                         else
                         {
-                            dictionary.Add(property0.Name, BinaryData.FromString(property0.Value.GetRawText()));
+                            dictionary.Add(property0.Name, JsonSerializer.Deserialize<DataFactoryElement<string>>(property0.Value.GetRawText()));
                         }
                     }
                     additionalCopyOptions = dictionary;
@@ -109,7 +110,7 @@ internal static SnowflakeImportCopyCommand DeserializeSnowflakeImportCopyCommand
                     {
                         continue;
                     }
-                    Dictionary<string, BinaryData> dictionary = new Dictionary<string, BinaryData>();
+                    Dictionary<string, DataFactoryElement<string>> dictionary = new Dictionary<string, DataFactoryElement<string>>();
                     foreach (var property0 in property.Value.EnumerateObject())
                     {
                         if (property0.Value.ValueKind == JsonValueKind.Null)
@@ -118,7 +119,7 @@ internal static SnowflakeImportCopyCommand DeserializeSnowflakeImportCopyCommand
                         }
                         else
                         {
-                            dictionary.Add(property0.Name, BinaryData.FromString(property0.Value.GetRawText()));
+                            dictionary.Add(property0.Name, JsonSerializer.Deserialize<DataFactoryElement<string>>(property0.Value.GetRawText()));
                         }
                     }
                     additionalFormatOptions = dictionary;
@@ -129,7 +130,7 @@ internal static SnowflakeImportCopyCommand DeserializeSnowflakeImportCopyCommand
                     type = property.Value.GetString();
                     continue;
                 }
-                additionalPropertiesDictionary.Add(property.Name, BinaryData.FromString(property.Value.GetRawText()));
+                additionalPropertiesDictionary.Add(property.Name, JsonSerializer.Deserialize<DataFactoryElement<string>>(property.Value.GetRawText()));
             }
             additionalProperties = additionalPropertiesDictionary;
             return new SnowflakeImportCopyCommand(type, additionalProperties, Optional.ToDictionary(additionalCopyOptions), Optional.ToDictionary(additionalFormatOptions));
diff --git a/src/AzureDataFactory.TestingFramework/Generated/Models/SnowflakeImportCopyCommand.cs b/src/AzureDataFactory.TestingFramework/Generated/Models/SnowflakeImportCopyCommand.cs
index 0dd40169..57a45de7 100644
--- a/src/AzureDataFactory.TestingFramework/Generated/Models/SnowflakeImportCopyCommand.cs
+++ b/src/AzureDataFactory.TestingFramework/Generated/Models/SnowflakeImportCopyCommand.cs
@@ -6,6 +6,7 @@
 #nullable disable
 
 using Azure.Core;
+using Azure.Core.Expressions.DataFactory;
 
 namespace AzureDataFactory.TestingFramework.Models
 {
@@ -15,8 +16,8 @@ public partial class SnowflakeImportCopyCommand : ImportSettings
         /// <summary> Initializes a new instance of SnowflakeImportCopyCommand. </summary>
         public SnowflakeImportCopyCommand()
         {
-            AdditionalCopyOptions = new ChangeTrackingDictionary<string, BinaryData>();
-            AdditionalFormatOptions = new ChangeTrackingDictionary<string, BinaryData>();
+            AdditionalCopyOptions = new ChangeTrackingDictionary<string, DataFactoryElement<string>>();
+            AdditionalFormatOptions = new ChangeTrackingDictionary<string, DataFactoryElement<string>>();
             ImportSettingsType = "SnowflakeImportCopyCommand";
         }
 
@@ -25,7 +26,7 @@ public SnowflakeImportCopyCommand()
         /// <param name="additionalProperties"> Additional Properties. </param>
         /// <param name="additionalCopyOptions"> Additional copy options directly passed to snowflake Copy Command. Type: key value pairs (value should be string type) (or Expression with resultType object). Example: "additionalCopyOptions": { "DATE_FORMAT": "MM/DD/YYYY", "TIME_FORMAT": "'HH24:MI:SS.FF'" }. </param>
         /// <param name="additionalFormatOptions"> Additional format options directly passed to snowflake Copy Command. Type: key value pairs (value should be string type) (or Expression with resultType object). Example: "additionalFormatOptions": { "FORCE": "TRUE", "LOAD_UNCERTAIN_FILES": "'FALSE'" }. </param>
-        internal SnowflakeImportCopyCommand(string importSettingsType, IDictionary<string, BinaryData> additionalProperties, IDictionary<string, BinaryData> additionalCopyOptions, IDictionary<string, BinaryData> additionalFormatOptions) : base(importSettingsType, additionalProperties)
+        internal SnowflakeImportCopyCommand(string importSettingsType, IDictionary<string, DataFactoryElement<string>> additionalProperties, IDictionary<string, DataFactoryElement<string>> additionalCopyOptions, IDictionary<string, DataFactoryElement<string>> additionalFormatOptions) : base(importSettingsType, additionalProperties)
         {
             AdditionalCopyOptions = additionalCopyOptions;
             AdditionalFormatOptions = additionalFormatOptions;
@@ -62,7 +63,7 @@ internal SnowflakeImportCopyCommand(string importSettingsType, IDictionary<strin
         /// </list>
         /// </para>
         /// </summary>
-        public IDictionary<string, BinaryData> AdditionalCopyOptions { get; }
+        public IDictionary<string, DataFactoryElement<string>> AdditionalCopyOptions { get; }
         /// <summary>
         /// Additional format options directly passed to snowflake Copy Command. Type: key value pairs (value should be string type) (or Expression with resultType object). Example: "additionalFormatOptions": { "FORCE": "TRUE", "LOAD_UNCERTAIN_FILES": "'FALSE'" }
         /// <para>
@@ -93,6 +94,6 @@ internal SnowflakeImportCopyCommand(string importSettingsType, IDictionary<strin
         /// </list>
         /// </para>
         /// </summary>
-        public IDictionary<string, BinaryData> AdditionalFormatOptions { get; }
+        public IDictionary<string, DataFactoryElement<string>> AdditionalFormatOptions { get; }
     }
 }
diff --git a/src/AzureDataFactory.TestingFramework/Generated/Models/SnowflakeLinkedService.Serialization.cs b/src/AzureDataFactory.TestingFramework/Generated/Models/SnowflakeLinkedService.Serialization.cs
index d697ace3..9df5014a 100644
--- a/src/AzureDataFactory.TestingFramework/Generated/Models/SnowflakeLinkedService.Serialization.cs
+++ b/src/AzureDataFactory.TestingFramework/Generated/Models/SnowflakeLinkedService.Serialization.cs
@@ -103,8 +103,8 @@ internal static SnowflakeLinkedService DeserializeSnowflakeLinkedService(JsonEle
             BinaryData connectionString = default;
             Optional<DataFactoryKeyVaultSecretReference> password = default;
             Optional<string> encryptedCredential = default;
-            IDictionary<string, BinaryData> additionalProperties = default;
-            Dictionary<string, BinaryData> additionalPropertiesDictionary = new Dictionary<string, BinaryData>();
+            IDictionary<string, DataFactoryElement<string>> additionalProperties = default;
+            Dictionary<string, DataFactoryElement<string>> additionalPropertiesDictionary = new Dictionary<string, DataFactoryElement<string>>();
             foreach (var property in element.EnumerateObject())
             {
                 if (property.NameEquals("type"u8))
@@ -192,7 +192,7 @@ internal static SnowflakeLinkedService DeserializeSnowflakeLinkedService(JsonEle
                     }
                     continue;
                 }
-                additionalPropertiesDictionary.Add(property.Name, BinaryData.FromString(property.Value.GetRawText()));
+                additionalPropertiesDictionary.Add(property.Name, JsonSerializer.Deserialize<DataFactoryElement<string>>(property.Value.GetRawText()));
             }
             additionalProperties = additionalPropertiesDictionary;
             return new SnowflakeLinkedService(type, connectVia.Value, description.Value, Optional.ToDictionary(parameters), Optional.ToList(annotations), additionalProperties, connectionString, password, encryptedCredential.Value);
diff --git a/src/AzureDataFactory.TestingFramework/Generated/Models/SnowflakeLinkedService.cs b/src/AzureDataFactory.TestingFramework/Generated/Models/SnowflakeLinkedService.cs
index 36b4ce79..25b0f1f4 100644
--- a/src/AzureDataFactory.TestingFramework/Generated/Models/SnowflakeLinkedService.cs
+++ b/src/AzureDataFactory.TestingFramework/Generated/Models/SnowflakeLinkedService.cs
@@ -34,7 +34,7 @@ public SnowflakeLinkedService(BinaryData connectionString)
         /// <param name="connectionString"> The connection string of snowflake. Type: string, SecureString. </param>
         /// <param name="password"> The Azure key vault secret reference of password in connection string. </param>
         /// <param name="encryptedCredential"> The encrypted credential used for authentication. Credentials are encrypted using the integration runtime credential manager. Type: string. </param>
-        internal SnowflakeLinkedService(string linkedServiceType, IntegrationRuntimeReference connectVia, string description, IDictionary<string, EntityParameterSpecification> parameters, IList<BinaryData> annotations, IDictionary<string, BinaryData> additionalProperties, BinaryData connectionString, DataFactoryKeyVaultSecretReference password, string encryptedCredential) : base(linkedServiceType, connectVia, description, parameters, annotations, additionalProperties)
+        internal SnowflakeLinkedService(string linkedServiceType, IntegrationRuntimeReference connectVia, string description, IDictionary<string, EntityParameterSpecification> parameters, IList<BinaryData> annotations, IDictionary<string, DataFactoryElement<string>> additionalProperties, BinaryData connectionString, DataFactoryKeyVaultSecretReference password, string encryptedCredential) : base(linkedServiceType, connectVia, description, parameters, annotations, additionalProperties)
         {
             ConnectionString = connectionString;
             Password = password;
diff --git a/src/AzureDataFactory.TestingFramework/Generated/Models/SnowflakeSink.Serialization.cs b/src/AzureDataFactory.TestingFramework/Generated/Models/SnowflakeSink.Serialization.cs
index ae1f3a91..78928f98 100644
--- a/src/AzureDataFactory.TestingFramework/Generated/Models/SnowflakeSink.Serialization.cs
+++ b/src/AzureDataFactory.TestingFramework/Generated/Models/SnowflakeSink.Serialization.cs
@@ -85,8 +85,8 @@ internal static SnowflakeSink DeserializeSnowflakeSink(JsonElement element)
             Optional<DataFactoryElement<string>> sinkRetryWait = default;
             Optional<DataFactoryElement<int>> maxConcurrentConnections = default;
             Optional<DataFactoryElement<bool>> disableMetricsCollection = default;
-            IDictionary<string, BinaryData> additionalProperties = default;
-            Dictionary<string, BinaryData> additionalPropertiesDictionary = new Dictionary<string, BinaryData>();
+            IDictionary<string, DataFactoryElement<string>> additionalProperties = default;
+            Dictionary<string, DataFactoryElement<string>> additionalPropertiesDictionary = new Dictionary<string, DataFactoryElement<string>>();
             foreach (var property in element.EnumerateObject())
             {
                 if (property.NameEquals("preCopyScript"u8))
@@ -166,7 +166,7 @@ internal static SnowflakeSink DeserializeSnowflakeSink(JsonElement element)
                     disableMetricsCollection = JsonSerializer.Deserialize<DataFactoryElement<bool>>(property.Value.GetRawText());
                     continue;
                 }
-                additionalPropertiesDictionary.Add(property.Name, BinaryData.FromString(property.Value.GetRawText()));
+                additionalPropertiesDictionary.Add(property.Name, JsonSerializer.Deserialize<DataFactoryElement<string>>(property.Value.GetRawText()));
             }
             additionalProperties = additionalPropertiesDictionary;
             return new SnowflakeSink(type, writeBatchSize.Value, writeBatchTimeout.Value, sinkRetryCount.Value, sinkRetryWait.Value, maxConcurrentConnections.Value, disableMetricsCollection.Value, additionalProperties, preCopyScript.Value, importSettings.Value);
diff --git a/src/AzureDataFactory.TestingFramework/Generated/Models/SnowflakeSink.cs b/src/AzureDataFactory.TestingFramework/Generated/Models/SnowflakeSink.cs
index 72e042e3..9f3d2ccf 100644
--- a/src/AzureDataFactory.TestingFramework/Generated/Models/SnowflakeSink.cs
+++ b/src/AzureDataFactory.TestingFramework/Generated/Models/SnowflakeSink.cs
@@ -29,7 +29,7 @@ public SnowflakeSink()
         /// <param name="additionalProperties"> Additional Properties. </param>
         /// <param name="preCopyScript"> SQL pre-copy script. Type: string (or Expression with resultType string). </param>
         /// <param name="importSettings"> Snowflake import settings. </param>
-        internal SnowflakeSink(string copySinkType, DataFactoryElement<int> writeBatchSize, DataFactoryElement<string> writeBatchTimeout, DataFactoryElement<int> sinkRetryCount, DataFactoryElement<string> sinkRetryWait, DataFactoryElement<int> maxConcurrentConnections, DataFactoryElement<bool> disableMetricsCollection, IDictionary<string, BinaryData> additionalProperties, DataFactoryElement<string> preCopyScript, SnowflakeImportCopyCommand importSettings) : base(copySinkType, writeBatchSize, writeBatchTimeout, sinkRetryCount, sinkRetryWait, maxConcurrentConnections, disableMetricsCollection, additionalProperties)
+        internal SnowflakeSink(string copySinkType, DataFactoryElement<int> writeBatchSize, DataFactoryElement<string> writeBatchTimeout, DataFactoryElement<int> sinkRetryCount, DataFactoryElement<string> sinkRetryWait, DataFactoryElement<int> maxConcurrentConnections, DataFactoryElement<bool> disableMetricsCollection, IDictionary<string, DataFactoryElement<string>> additionalProperties, DataFactoryElement<string> preCopyScript, SnowflakeImportCopyCommand importSettings) : base(copySinkType, writeBatchSize, writeBatchTimeout, sinkRetryCount, sinkRetryWait, maxConcurrentConnections, disableMetricsCollection, additionalProperties)
         {
             PreCopyScript = preCopyScript;
             ImportSettings = importSettings;
diff --git a/src/AzureDataFactory.TestingFramework/Generated/Models/SnowflakeSource.Serialization.cs b/src/AzureDataFactory.TestingFramework/Generated/Models/SnowflakeSource.Serialization.cs
index c0b5aa07..0e9a2cd0 100644
--- a/src/AzureDataFactory.TestingFramework/Generated/Models/SnowflakeSource.Serialization.cs
+++ b/src/AzureDataFactory.TestingFramework/Generated/Models/SnowflakeSource.Serialization.cs
@@ -70,8 +70,8 @@ internal static SnowflakeSource DeserializeSnowflakeSource(JsonElement element)
             Optional<DataFactoryElement<string>> sourceRetryWait = default;
             Optional<DataFactoryElement<int>> maxConcurrentConnections = default;
             Optional<DataFactoryElement<bool>> disableMetricsCollection = default;
-            IDictionary<string, BinaryData> additionalProperties = default;
-            Dictionary<string, BinaryData> additionalPropertiesDictionary = new Dictionary<string, BinaryData>();
+            IDictionary<string, DataFactoryElement<string>> additionalProperties = default;
+            Dictionary<string, DataFactoryElement<string>> additionalPropertiesDictionary = new Dictionary<string, DataFactoryElement<string>>();
             foreach (var property in element.EnumerateObject())
             {
                 if (property.NameEquals("query"u8))
@@ -129,7 +129,7 @@ internal static SnowflakeSource DeserializeSnowflakeSource(JsonElement element)
                     disableMetricsCollection = JsonSerializer.Deserialize<DataFactoryElement<bool>>(property.Value.GetRawText());
                     continue;
                 }
-                additionalPropertiesDictionary.Add(property.Name, BinaryData.FromString(property.Value.GetRawText()));
+                additionalPropertiesDictionary.Add(property.Name, JsonSerializer.Deserialize<DataFactoryElement<string>>(property.Value.GetRawText()));
             }
             additionalProperties = additionalPropertiesDictionary;
             return new SnowflakeSource(type, sourceRetryCount.Value, sourceRetryWait.Value, maxConcurrentConnections.Value, disableMetricsCollection.Value, additionalProperties, query.Value, exportSettings);
diff --git a/src/AzureDataFactory.TestingFramework/Generated/Models/SnowflakeSource.cs b/src/AzureDataFactory.TestingFramework/Generated/Models/SnowflakeSource.cs
index 09401788..19bbfa1f 100644
--- a/src/AzureDataFactory.TestingFramework/Generated/Models/SnowflakeSource.cs
+++ b/src/AzureDataFactory.TestingFramework/Generated/Models/SnowflakeSource.cs
@@ -33,7 +33,7 @@ public SnowflakeSource(SnowflakeExportCopyCommand exportSettings)
         /// <param name="additionalProperties"> Additional Properties. </param>
         /// <param name="query"> Snowflake Sql query. Type: string (or Expression with resultType string). </param>
         /// <param name="exportSettings"> Snowflake export settings. </param>
-        internal SnowflakeSource(string copySourceType, DataFactoryElement<int> sourceRetryCount, DataFactoryElement<string> sourceRetryWait, DataFactoryElement<int> maxConcurrentConnections, DataFactoryElement<bool> disableMetricsCollection, IDictionary<string, BinaryData> additionalProperties, DataFactoryElement<string> query, SnowflakeExportCopyCommand exportSettings) : base(copySourceType, sourceRetryCount, sourceRetryWait, maxConcurrentConnections, disableMetricsCollection, additionalProperties)
+        internal SnowflakeSource(string copySourceType, DataFactoryElement<int> sourceRetryCount, DataFactoryElement<string> sourceRetryWait, DataFactoryElement<int> maxConcurrentConnections, DataFactoryElement<bool> disableMetricsCollection, IDictionary<string, DataFactoryElement<string>> additionalProperties, DataFactoryElement<string> query, SnowflakeExportCopyCommand exportSettings) : base(copySourceType, sourceRetryCount, sourceRetryWait, maxConcurrentConnections, disableMetricsCollection, additionalProperties)
         {
             Query = query;
             ExportSettings = exportSettings;
diff --git a/src/AzureDataFactory.TestingFramework/Generated/Models/SparkLinkedService.Serialization.cs b/src/AzureDataFactory.TestingFramework/Generated/Models/SparkLinkedService.Serialization.cs
index 66f5e655..c382ceaf 100644
--- a/src/AzureDataFactory.TestingFramework/Generated/Models/SparkLinkedService.Serialization.cs
+++ b/src/AzureDataFactory.TestingFramework/Generated/Models/SparkLinkedService.Serialization.cs
@@ -159,8 +159,8 @@ internal static SparkLinkedService DeserializeSparkLinkedService(JsonElement ele
             Optional<DataFactoryElement<bool>> allowHostNameCNMismatch = default;
             Optional<DataFactoryElement<bool>> allowSelfSignedServerCert = default;
             Optional<string> encryptedCredential = default;
-            IDictionary<string, BinaryData> additionalProperties = default;
-            Dictionary<string, BinaryData> additionalPropertiesDictionary = new Dictionary<string, BinaryData>();
+            IDictionary<string, DataFactoryElement<string>> additionalProperties = default;
+            Dictionary<string, DataFactoryElement<string>> additionalPropertiesDictionary = new Dictionary<string, DataFactoryElement<string>>();
             foreach (var property in element.EnumerateObject())
             {
                 if (property.NameEquals("type"u8))
@@ -339,7 +339,7 @@ internal static SparkLinkedService DeserializeSparkLinkedService(JsonElement ele
                     }
                     continue;
                 }
-                additionalPropertiesDictionary.Add(property.Name, BinaryData.FromString(property.Value.GetRawText()));
+                additionalPropertiesDictionary.Add(property.Name, JsonSerializer.Deserialize<DataFactoryElement<string>>(property.Value.GetRawText()));
             }
             additionalProperties = additionalPropertiesDictionary;
             return new SparkLinkedService(type, connectVia.Value, description.Value, Optional.ToDictionary(parameters), Optional.ToList(annotations), additionalProperties, host, port, Optional.ToNullable(serverType), Optional.ToNullable(thriftTransportProtocol), authenticationType, username.Value, password, httpPath.Value, enableSsl.Value, trustedCertPath.Value, useSystemTrustStore.Value, allowHostNameCNMismatch.Value, allowSelfSignedServerCert.Value, encryptedCredential.Value);
diff --git a/src/AzureDataFactory.TestingFramework/Generated/Models/SparkLinkedService.cs b/src/AzureDataFactory.TestingFramework/Generated/Models/SparkLinkedService.cs
index c4a2b644..3fe30652 100644
--- a/src/AzureDataFactory.TestingFramework/Generated/Models/SparkLinkedService.cs
+++ b/src/AzureDataFactory.TestingFramework/Generated/Models/SparkLinkedService.cs
@@ -50,7 +50,7 @@ public SparkLinkedService(DataFactoryElement<string> host, DataFactoryElement<in
         /// <param name="allowHostNameCNMismatch"> Specifies whether to require a CA-issued SSL certificate name to match the host name of the server when connecting over SSL. The default value is false. </param>
         /// <param name="allowSelfSignedServerCert"> Specifies whether to allow self-signed certificates from the server. The default value is false. </param>
         /// <param name="encryptedCredential"> The encrypted credential used for authentication. Credentials are encrypted using the integration runtime credential manager. Type: string. </param>
-        internal SparkLinkedService(string linkedServiceType, IntegrationRuntimeReference connectVia, string description, IDictionary<string, EntityParameterSpecification> parameters, IList<BinaryData> annotations, IDictionary<string, BinaryData> additionalProperties, DataFactoryElement<string> host, DataFactoryElement<int> port, SparkServerType? serverType, SparkThriftTransportProtocol? thriftTransportProtocol, SparkAuthenticationType authenticationType, DataFactoryElement<string> username, DataFactorySecretBaseDefinition password, DataFactoryElement<string> httpPath, DataFactoryElement<bool> enableSsl, DataFactoryElement<string> trustedCertPath, DataFactoryElement<bool> useSystemTrustStore, DataFactoryElement<bool> allowHostNameCNMismatch, DataFactoryElement<bool> allowSelfSignedServerCert, string encryptedCredential) : base(linkedServiceType, connectVia, description, parameters, annotations, additionalProperties)
+        internal SparkLinkedService(string linkedServiceType, IntegrationRuntimeReference connectVia, string description, IDictionary<string, EntityParameterSpecification> parameters, IList<BinaryData> annotations, IDictionary<string, DataFactoryElement<string>> additionalProperties, DataFactoryElement<string> host, DataFactoryElement<int> port, SparkServerType? serverType, SparkThriftTransportProtocol? thriftTransportProtocol, SparkAuthenticationType authenticationType, DataFactoryElement<string> username, DataFactorySecretBaseDefinition password, DataFactoryElement<string> httpPath, DataFactoryElement<bool> enableSsl, DataFactoryElement<string> trustedCertPath, DataFactoryElement<bool> useSystemTrustStore, DataFactoryElement<bool> allowHostNameCNMismatch, DataFactoryElement<bool> allowSelfSignedServerCert, string encryptedCredential) : base(linkedServiceType, connectVia, description, parameters, annotations, additionalProperties)
         {
             Host = host;
             Port = port;
diff --git a/src/AzureDataFactory.TestingFramework/Generated/Models/SparkObjectDataset.Serialization.cs b/src/AzureDataFactory.TestingFramework/Generated/Models/SparkObjectDataset.Serialization.cs
index fd60428d..a211935c 100644
--- a/src/AzureDataFactory.TestingFramework/Generated/Models/SparkObjectDataset.Serialization.cs
+++ b/src/AzureDataFactory.TestingFramework/Generated/Models/SparkObjectDataset.Serialization.cs
@@ -120,8 +120,8 @@ internal static SparkObjectDataset DeserializeSparkObjectDataset(JsonElement ele
             Optional<BinaryData> tableName = default;
             Optional<DataFactoryElement<string>> table = default;
             Optional<DataFactoryElement<string>> schema0 = default;
-            IDictionary<string, BinaryData> additionalProperties = default;
-            Dictionary<string, BinaryData> additionalPropertiesDictionary = new Dictionary<string, BinaryData>();
+            IDictionary<string, DataFactoryElement<string>> additionalProperties = default;
+            Dictionary<string, DataFactoryElement<string>> additionalPropertiesDictionary = new Dictionary<string, DataFactoryElement<string>>();
             foreach (var property in element.EnumerateObject())
             {
                 if (property.NameEquals("type"u8))
@@ -240,7 +240,7 @@ internal static SparkObjectDataset DeserializeSparkObjectDataset(JsonElement ele
                     }
                     continue;
                 }
-                additionalPropertiesDictionary.Add(property.Name, BinaryData.FromString(property.Value.GetRawText()));
+                additionalPropertiesDictionary.Add(property.Name, JsonSerializer.Deserialize<DataFactoryElement<string>>(property.Value.GetRawText()));
             }
             additionalProperties = additionalPropertiesDictionary;
             return new SparkObjectDataset(type, description.Value, structure.Value, schema.Value, linkedServiceName, Optional.ToDictionary(parameters), Optional.ToList(annotations), folder.Value, additionalProperties, tableName.Value, table.Value, schema0.Value);
diff --git a/src/AzureDataFactory.TestingFramework/Generated/Models/SparkObjectDataset.cs b/src/AzureDataFactory.TestingFramework/Generated/Models/SparkObjectDataset.cs
index 6a8a2608..83e71c56 100644
--- a/src/AzureDataFactory.TestingFramework/Generated/Models/SparkObjectDataset.cs
+++ b/src/AzureDataFactory.TestingFramework/Generated/Models/SparkObjectDataset.cs
@@ -36,7 +36,7 @@ public SparkObjectDataset(DataFactoryLinkedServiceReference linkedServiceName) :
         /// <param name="tableName"> This property will be retired. Please consider using schema + table properties instead. </param>
         /// <param name="table"> The table name of the Spark. Type: string (or Expression with resultType string). </param>
         /// <param name="schemaTypePropertiesSchema"> The schema name of the Spark. Type: string (or Expression with resultType string). </param>
-        internal SparkObjectDataset(string datasetType, string description, DataFactoryElement<IList<DatasetDataElement>> structure, DataFactoryElement<IList<DatasetSchemaDataElement>> schema, DataFactoryLinkedServiceReference linkedServiceName, IDictionary<string, EntityParameterSpecification> parameters, IList<BinaryData> annotations, DatasetFolder folder, IDictionary<string, BinaryData> additionalProperties, BinaryData tableName, DataFactoryElement<string> table, DataFactoryElement<string> schemaTypePropertiesSchema) : base(datasetType, description, structure, schema, linkedServiceName, parameters, annotations, folder, additionalProperties)
+        internal SparkObjectDataset(string datasetType, string description, DataFactoryElement<IList<DatasetDataElement>> structure, DataFactoryElement<IList<DatasetSchemaDataElement>> schema, DataFactoryLinkedServiceReference linkedServiceName, IDictionary<string, EntityParameterSpecification> parameters, IList<BinaryData> annotations, DatasetFolder folder, IDictionary<string, DataFactoryElement<string>> additionalProperties, BinaryData tableName, DataFactoryElement<string> table, DataFactoryElement<string> schemaTypePropertiesSchema) : base(datasetType, description, structure, schema, linkedServiceName, parameters, annotations, folder, additionalProperties)
         {
             TableName = tableName;
             Table = table;
diff --git a/src/AzureDataFactory.TestingFramework/Generated/Models/SparkSource.Serialization.cs b/src/AzureDataFactory.TestingFramework/Generated/Models/SparkSource.Serialization.cs
index e74c11d3..102341fd 100644
--- a/src/AzureDataFactory.TestingFramework/Generated/Models/SparkSource.Serialization.cs
+++ b/src/AzureDataFactory.TestingFramework/Generated/Models/SparkSource.Serialization.cs
@@ -83,8 +83,8 @@ internal static SparkSource DeserializeSparkSource(JsonElement element)
             Optional<DataFactoryElement<string>> sourceRetryWait = default;
             Optional<DataFactoryElement<int>> maxConcurrentConnections = default;
             Optional<DataFactoryElement<bool>> disableMetricsCollection = default;
-            IDictionary<string, BinaryData> additionalProperties = default;
-            Dictionary<string, BinaryData> additionalPropertiesDictionary = new Dictionary<string, BinaryData>();
+            IDictionary<string, DataFactoryElement<string>> additionalProperties = default;
+            Dictionary<string, DataFactoryElement<string>> additionalPropertiesDictionary = new Dictionary<string, DataFactoryElement<string>>();
             foreach (var property in element.EnumerateObject())
             {
                 if (property.NameEquals("query"u8))
@@ -155,7 +155,7 @@ internal static SparkSource DeserializeSparkSource(JsonElement element)
                     disableMetricsCollection = JsonSerializer.Deserialize<DataFactoryElement<bool>>(property.Value.GetRawText());
                     continue;
                 }
-                additionalPropertiesDictionary.Add(property.Name, BinaryData.FromString(property.Value.GetRawText()));
+                additionalPropertiesDictionary.Add(property.Name, JsonSerializer.Deserialize<DataFactoryElement<string>>(property.Value.GetRawText()));
             }
             additionalProperties = additionalPropertiesDictionary;
             return new SparkSource(type, sourceRetryCount.Value, sourceRetryWait.Value, maxConcurrentConnections.Value, disableMetricsCollection.Value, additionalProperties, queryTimeout.Value, additionalColumns.Value, query.Value);
diff --git a/src/AzureDataFactory.TestingFramework/Generated/Models/SparkSource.cs b/src/AzureDataFactory.TestingFramework/Generated/Models/SparkSource.cs
index 148d94b2..94c2b7b0 100644
--- a/src/AzureDataFactory.TestingFramework/Generated/Models/SparkSource.cs
+++ b/src/AzureDataFactory.TestingFramework/Generated/Models/SparkSource.cs
@@ -28,7 +28,7 @@ public SparkSource()
         /// <param name="queryTimeout"> Query timeout. Type: string (or Expression with resultType string), pattern: ((\d+)\.)?(\d\d):(60|([0-5][0-9])):(60|([0-5][0-9])). </param>
         /// <param name="additionalColumns"> Specifies the additional columns to be added to source data. Type: array of objects(AdditionalColumns) (or Expression with resultType array of objects). </param>
         /// <param name="query"> A query to retrieve data from source. Type: string (or Expression with resultType string). </param>
-        internal SparkSource(string copySourceType, DataFactoryElement<int> sourceRetryCount, DataFactoryElement<string> sourceRetryWait, DataFactoryElement<int> maxConcurrentConnections, DataFactoryElement<bool> disableMetricsCollection, IDictionary<string, BinaryData> additionalProperties, DataFactoryElement<string> queryTimeout, BinaryData additionalColumns, DataFactoryElement<string> query) : base(copySourceType, sourceRetryCount, sourceRetryWait, maxConcurrentConnections, disableMetricsCollection, additionalProperties, queryTimeout, additionalColumns)
+        internal SparkSource(string copySourceType, DataFactoryElement<int> sourceRetryCount, DataFactoryElement<string> sourceRetryWait, DataFactoryElement<int> maxConcurrentConnections, DataFactoryElement<bool> disableMetricsCollection, IDictionary<string, DataFactoryElement<string>> additionalProperties, DataFactoryElement<string> queryTimeout, BinaryData additionalColumns, DataFactoryElement<string> query) : base(copySourceType, sourceRetryCount, sourceRetryWait, maxConcurrentConnections, disableMetricsCollection, additionalProperties, queryTimeout, additionalColumns)
         {
             Query = query;
             CopySourceType = copySourceType ?? "SparkSource";
diff --git a/src/AzureDataFactory.TestingFramework/Generated/Models/SqlDWSink.Serialization.cs b/src/AzureDataFactory.TestingFramework/Generated/Models/SqlDWSink.Serialization.cs
index d7d5d739..a465277a 100644
--- a/src/AzureDataFactory.TestingFramework/Generated/Models/SqlDWSink.Serialization.cs
+++ b/src/AzureDataFactory.TestingFramework/Generated/Models/SqlDWSink.Serialization.cs
@@ -131,8 +131,8 @@ internal static SqlDWSink DeserializeSqlDWSink(JsonElement element)
             Optional<DataFactoryElement<string>> sinkRetryWait = default;
             Optional<DataFactoryElement<int>> maxConcurrentConnections = default;
             Optional<DataFactoryElement<bool>> disableMetricsCollection = default;
-            IDictionary<string, BinaryData> additionalProperties = default;
-            Dictionary<string, BinaryData> additionalPropertiesDictionary = new Dictionary<string, BinaryData>();
+            IDictionary<string, DataFactoryElement<string>> additionalProperties = default;
+            Dictionary<string, DataFactoryElement<string>> additionalPropertiesDictionary = new Dictionary<string, DataFactoryElement<string>>();
             foreach (var property in element.EnumerateObject())
             {
                 if (property.NameEquals("preCopyScript"u8))
@@ -275,7 +275,7 @@ internal static SqlDWSink DeserializeSqlDWSink(JsonElement element)
                     disableMetricsCollection = JsonSerializer.Deserialize<DataFactoryElement<bool>>(property.Value.GetRawText());
                     continue;
                 }
-                additionalPropertiesDictionary.Add(property.Name, BinaryData.FromString(property.Value.GetRawText()));
+                additionalPropertiesDictionary.Add(property.Name, JsonSerializer.Deserialize<DataFactoryElement<string>>(property.Value.GetRawText()));
             }
             additionalProperties = additionalPropertiesDictionary;
             return new SqlDWSink(type, writeBatchSize.Value, writeBatchTimeout.Value, sinkRetryCount.Value, sinkRetryWait.Value, maxConcurrentConnections.Value, disableMetricsCollection.Value, additionalProperties, preCopyScript.Value, allowPolyBase.Value, polyBaseSettings.Value, allowCopyCommand.Value, copyCommandSettings.Value, tableOption.Value, sqlWriterUseTableLock.Value, writeBehavior.Value, upsertSettings.Value);
diff --git a/src/AzureDataFactory.TestingFramework/Generated/Models/SqlDWSink.cs b/src/AzureDataFactory.TestingFramework/Generated/Models/SqlDWSink.cs
index 25b9d98b..603d25f6 100644
--- a/src/AzureDataFactory.TestingFramework/Generated/Models/SqlDWSink.cs
+++ b/src/AzureDataFactory.TestingFramework/Generated/Models/SqlDWSink.cs
@@ -36,7 +36,7 @@ public SqlDWSink()
         /// <param name="sqlWriterUseTableLock"> Whether to use table lock during bulk copy. Type: boolean (or Expression with resultType boolean). </param>
         /// <param name="writeBehavior"> Write behavior when copying data into azure SQL DW. Type: SqlDWWriteBehaviorEnum (or Expression with resultType SqlDWWriteBehaviorEnum). </param>
         /// <param name="upsertSettings"> SQL DW upsert settings. </param>
-        internal SqlDWSink(string copySinkType, DataFactoryElement<int> writeBatchSize, DataFactoryElement<string> writeBatchTimeout, DataFactoryElement<int> sinkRetryCount, DataFactoryElement<string> sinkRetryWait, DataFactoryElement<int> maxConcurrentConnections, DataFactoryElement<bool> disableMetricsCollection, IDictionary<string, BinaryData> additionalProperties, DataFactoryElement<string> preCopyScript, DataFactoryElement<bool> allowPolyBase, PolybaseSettings polyBaseSettings, DataFactoryElement<bool> allowCopyCommand, DWCopyCommandSettings copyCommandSettings, DataFactoryElement<string> tableOption, DataFactoryElement<bool> sqlWriterUseTableLock, BinaryData writeBehavior, SqlDWUpsertSettings upsertSettings) : base(copySinkType, writeBatchSize, writeBatchTimeout, sinkRetryCount, sinkRetryWait, maxConcurrentConnections, disableMetricsCollection, additionalProperties)
+        internal SqlDWSink(string copySinkType, DataFactoryElement<int> writeBatchSize, DataFactoryElement<string> writeBatchTimeout, DataFactoryElement<int> sinkRetryCount, DataFactoryElement<string> sinkRetryWait, DataFactoryElement<int> maxConcurrentConnections, DataFactoryElement<bool> disableMetricsCollection, IDictionary<string, DataFactoryElement<string>> additionalProperties, DataFactoryElement<string> preCopyScript, DataFactoryElement<bool> allowPolyBase, PolybaseSettings polyBaseSettings, DataFactoryElement<bool> allowCopyCommand, DWCopyCommandSettings copyCommandSettings, DataFactoryElement<string> tableOption, DataFactoryElement<bool> sqlWriterUseTableLock, BinaryData writeBehavior, SqlDWUpsertSettings upsertSettings) : base(copySinkType, writeBatchSize, writeBatchTimeout, sinkRetryCount, sinkRetryWait, maxConcurrentConnections, disableMetricsCollection, additionalProperties)
         {
             PreCopyScript = preCopyScript;
             AllowPolyBase = allowPolyBase;
diff --git a/src/AzureDataFactory.TestingFramework/Generated/Models/SqlDWSource.Serialization.cs b/src/AzureDataFactory.TestingFramework/Generated/Models/SqlDWSource.Serialization.cs
index 89b40675..5c689fed 100644
--- a/src/AzureDataFactory.TestingFramework/Generated/Models/SqlDWSource.Serialization.cs
+++ b/src/AzureDataFactory.TestingFramework/Generated/Models/SqlDWSource.Serialization.cs
@@ -121,8 +121,8 @@ internal static SqlDWSource DeserializeSqlDWSource(JsonElement element)
             Optional<DataFactoryElement<string>> sourceRetryWait = default;
             Optional<DataFactoryElement<int>> maxConcurrentConnections = default;
             Optional<DataFactoryElement<bool>> disableMetricsCollection = default;
-            IDictionary<string, BinaryData> additionalProperties = default;
-            Dictionary<string, BinaryData> additionalPropertiesDictionary = new Dictionary<string, BinaryData>();
+            IDictionary<string, DataFactoryElement<string>> additionalProperties = default;
+            Dictionary<string, DataFactoryElement<string>> additionalPropertiesDictionary = new Dictionary<string, DataFactoryElement<string>>();
             foreach (var property in element.EnumerateObject())
             {
                 if (property.NameEquals("sqlReaderQuery"u8))
@@ -238,7 +238,7 @@ internal static SqlDWSource DeserializeSqlDWSource(JsonElement element)
                     disableMetricsCollection = JsonSerializer.Deserialize<DataFactoryElement<bool>>(property.Value.GetRawText());
                     continue;
                 }
-                additionalPropertiesDictionary.Add(property.Name, BinaryData.FromString(property.Value.GetRawText()));
+                additionalPropertiesDictionary.Add(property.Name, JsonSerializer.Deserialize<DataFactoryElement<string>>(property.Value.GetRawText()));
             }
             additionalProperties = additionalPropertiesDictionary;
             return new SqlDWSource(type, sourceRetryCount.Value, sourceRetryWait.Value, maxConcurrentConnections.Value, disableMetricsCollection.Value, additionalProperties, queryTimeout.Value, additionalColumns.Value, sqlReaderQuery.Value, sqlReaderStoredProcedureName.Value, storedProcedureParameters.Value, isolationLevel.Value, partitionOption.Value, partitionSettings.Value);
diff --git a/src/AzureDataFactory.TestingFramework/Generated/Models/SqlDWSource.cs b/src/AzureDataFactory.TestingFramework/Generated/Models/SqlDWSource.cs
index 20abc187..2ce658a4 100644
--- a/src/AzureDataFactory.TestingFramework/Generated/Models/SqlDWSource.cs
+++ b/src/AzureDataFactory.TestingFramework/Generated/Models/SqlDWSource.cs
@@ -33,7 +33,7 @@ public SqlDWSource()
         /// <param name="isolationLevel"> Specifies the transaction locking behavior for the SQL source. Allowed values: ReadCommitted/ReadUncommitted/RepeatableRead/Serializable/Snapshot. The default value is ReadCommitted. Type: string (or Expression with resultType string). </param>
         /// <param name="partitionOption"> The partition mechanism that will be used for Sql read in parallel. Possible values include: "None", "PhysicalPartitionsOfTable", "DynamicRange". </param>
         /// <param name="partitionSettings"> The settings that will be leveraged for Sql source partitioning. </param>
-        internal SqlDWSource(string copySourceType, DataFactoryElement<int> sourceRetryCount, DataFactoryElement<string> sourceRetryWait, DataFactoryElement<int> maxConcurrentConnections, DataFactoryElement<bool> disableMetricsCollection, IDictionary<string, BinaryData> additionalProperties, DataFactoryElement<string> queryTimeout, BinaryData additionalColumns, DataFactoryElement<string> sqlReaderQuery, DataFactoryElement<string> sqlReaderStoredProcedureName, BinaryData storedProcedureParameters, DataFactoryElement<string> isolationLevel, BinaryData partitionOption, SqlPartitionSettings partitionSettings) : base(copySourceType, sourceRetryCount, sourceRetryWait, maxConcurrentConnections, disableMetricsCollection, additionalProperties, queryTimeout, additionalColumns)
+        internal SqlDWSource(string copySourceType, DataFactoryElement<int> sourceRetryCount, DataFactoryElement<string> sourceRetryWait, DataFactoryElement<int> maxConcurrentConnections, DataFactoryElement<bool> disableMetricsCollection, IDictionary<string, DataFactoryElement<string>> additionalProperties, DataFactoryElement<string> queryTimeout, BinaryData additionalColumns, DataFactoryElement<string> sqlReaderQuery, DataFactoryElement<string> sqlReaderStoredProcedureName, BinaryData storedProcedureParameters, DataFactoryElement<string> isolationLevel, BinaryData partitionOption, SqlPartitionSettings partitionSettings) : base(copySourceType, sourceRetryCount, sourceRetryWait, maxConcurrentConnections, disableMetricsCollection, additionalProperties, queryTimeout, additionalColumns)
         {
             SqlReaderQuery = sqlReaderQuery;
             SqlReaderStoredProcedureName = sqlReaderStoredProcedureName;
diff --git a/src/AzureDataFactory.TestingFramework/Generated/Models/SqlMISink.Serialization.cs b/src/AzureDataFactory.TestingFramework/Generated/Models/SqlMISink.Serialization.cs
index 8ea4c6ab..aea8e5f2 100644
--- a/src/AzureDataFactory.TestingFramework/Generated/Models/SqlMISink.Serialization.cs
+++ b/src/AzureDataFactory.TestingFramework/Generated/Models/SqlMISink.Serialization.cs
@@ -135,8 +135,8 @@ internal static SqlMISink DeserializeSqlMISink(JsonElement element)
             Optional<DataFactoryElement<string>> sinkRetryWait = default;
             Optional<DataFactoryElement<int>> maxConcurrentConnections = default;
             Optional<DataFactoryElement<bool>> disableMetricsCollection = default;
-            IDictionary<string, BinaryData> additionalProperties = default;
-            Dictionary<string, BinaryData> additionalPropertiesDictionary = new Dictionary<string, BinaryData>();
+            IDictionary<string, DataFactoryElement<string>> additionalProperties = default;
+            Dictionary<string, DataFactoryElement<string>> additionalPropertiesDictionary = new Dictionary<string, DataFactoryElement<string>>();
             foreach (var property in element.EnumerateObject())
             {
                 if (property.NameEquals("sqlWriterStoredProcedureName"u8))
@@ -279,7 +279,7 @@ internal static SqlMISink DeserializeSqlMISink(JsonElement element)
                     disableMetricsCollection = JsonSerializer.Deserialize<DataFactoryElement<bool>>(property.Value.GetRawText());
                     continue;
                 }
-                additionalPropertiesDictionary.Add(property.Name, BinaryData.FromString(property.Value.GetRawText()));
+                additionalPropertiesDictionary.Add(property.Name, JsonSerializer.Deserialize<DataFactoryElement<string>>(property.Value.GetRawText()));
             }
             additionalProperties = additionalPropertiesDictionary;
             return new SqlMISink(type, writeBatchSize.Value, writeBatchTimeout.Value, sinkRetryCount.Value, sinkRetryWait.Value, maxConcurrentConnections.Value, disableMetricsCollection.Value, additionalProperties, sqlWriterStoredProcedureName.Value, sqlWriterTableType.Value, preCopyScript.Value, storedProcedureParameters.Value, storedProcedureTableTypeParameterName.Value, tableOption.Value, sqlWriterUseTableLock.Value, writeBehavior.Value, upsertSettings.Value);
diff --git a/src/AzureDataFactory.TestingFramework/Generated/Models/SqlMISink.cs b/src/AzureDataFactory.TestingFramework/Generated/Models/SqlMISink.cs
index c704dde6..b0fc5a17 100644
--- a/src/AzureDataFactory.TestingFramework/Generated/Models/SqlMISink.cs
+++ b/src/AzureDataFactory.TestingFramework/Generated/Models/SqlMISink.cs
@@ -36,7 +36,7 @@ public SqlMISink()
         /// <param name="sqlWriterUseTableLock"> Whether to use table lock during bulk copy. Type: boolean (or Expression with resultType boolean). </param>
         /// <param name="writeBehavior"> White behavior when copying data into azure SQL MI. Type: SqlWriteBehaviorEnum (or Expression with resultType SqlWriteBehaviorEnum). </param>
         /// <param name="upsertSettings"> SQL upsert settings. </param>
-        internal SqlMISink(string copySinkType, DataFactoryElement<int> writeBatchSize, DataFactoryElement<string> writeBatchTimeout, DataFactoryElement<int> sinkRetryCount, DataFactoryElement<string> sinkRetryWait, DataFactoryElement<int> maxConcurrentConnections, DataFactoryElement<bool> disableMetricsCollection, IDictionary<string, BinaryData> additionalProperties, DataFactoryElement<string> sqlWriterStoredProcedureName, DataFactoryElement<string> sqlWriterTableType, DataFactoryElement<string> preCopyScript, BinaryData storedProcedureParameters, DataFactoryElement<string> storedProcedureTableTypeParameterName, DataFactoryElement<string> tableOption, DataFactoryElement<bool> sqlWriterUseTableLock, BinaryData writeBehavior, SqlUpsertSettings upsertSettings) : base(copySinkType, writeBatchSize, writeBatchTimeout, sinkRetryCount, sinkRetryWait, maxConcurrentConnections, disableMetricsCollection, additionalProperties)
+        internal SqlMISink(string copySinkType, DataFactoryElement<int> writeBatchSize, DataFactoryElement<string> writeBatchTimeout, DataFactoryElement<int> sinkRetryCount, DataFactoryElement<string> sinkRetryWait, DataFactoryElement<int> maxConcurrentConnections, DataFactoryElement<bool> disableMetricsCollection, IDictionary<string, DataFactoryElement<string>> additionalProperties, DataFactoryElement<string> sqlWriterStoredProcedureName, DataFactoryElement<string> sqlWriterTableType, DataFactoryElement<string> preCopyScript, BinaryData storedProcedureParameters, DataFactoryElement<string> storedProcedureTableTypeParameterName, DataFactoryElement<string> tableOption, DataFactoryElement<bool> sqlWriterUseTableLock, BinaryData writeBehavior, SqlUpsertSettings upsertSettings) : base(copySinkType, writeBatchSize, writeBatchTimeout, sinkRetryCount, sinkRetryWait, maxConcurrentConnections, disableMetricsCollection, additionalProperties)
         {
             SqlWriterStoredProcedureName = sqlWriterStoredProcedureName;
             SqlWriterTableType = sqlWriterTableType;
diff --git a/src/AzureDataFactory.TestingFramework/Generated/Models/SqlMISource.Serialization.cs b/src/AzureDataFactory.TestingFramework/Generated/Models/SqlMISource.Serialization.cs
index d787ae47..c79a4722 100644
--- a/src/AzureDataFactory.TestingFramework/Generated/Models/SqlMISource.Serialization.cs
+++ b/src/AzureDataFactory.TestingFramework/Generated/Models/SqlMISource.Serialization.cs
@@ -131,8 +131,8 @@ internal static SqlMISource DeserializeSqlMISource(JsonElement element)
             Optional<DataFactoryElement<string>> sourceRetryWait = default;
             Optional<DataFactoryElement<int>> maxConcurrentConnections = default;
             Optional<DataFactoryElement<bool>> disableMetricsCollection = default;
-            IDictionary<string, BinaryData> additionalProperties = default;
-            Dictionary<string, BinaryData> additionalPropertiesDictionary = new Dictionary<string, BinaryData>();
+            IDictionary<string, DataFactoryElement<string>> additionalProperties = default;
+            Dictionary<string, DataFactoryElement<string>> additionalPropertiesDictionary = new Dictionary<string, DataFactoryElement<string>>();
             foreach (var property in element.EnumerateObject())
             {
                 if (property.NameEquals("sqlReaderQuery"u8))
@@ -257,7 +257,7 @@ internal static SqlMISource DeserializeSqlMISource(JsonElement element)
                     disableMetricsCollection = JsonSerializer.Deserialize<DataFactoryElement<bool>>(property.Value.GetRawText());
                     continue;
                 }
-                additionalPropertiesDictionary.Add(property.Name, BinaryData.FromString(property.Value.GetRawText()));
+                additionalPropertiesDictionary.Add(property.Name, JsonSerializer.Deserialize<DataFactoryElement<string>>(property.Value.GetRawText()));
             }
             additionalProperties = additionalPropertiesDictionary;
             return new SqlMISource(type, sourceRetryCount.Value, sourceRetryWait.Value, maxConcurrentConnections.Value, disableMetricsCollection.Value, additionalProperties, queryTimeout.Value, additionalColumns.Value, sqlReaderQuery.Value, sqlReaderStoredProcedureName.Value, storedProcedureParameters.Value, isolationLevel.Value, produceAdditionalTypes.Value, partitionOption.Value, partitionSettings.Value);
diff --git a/src/AzureDataFactory.TestingFramework/Generated/Models/SqlMISource.cs b/src/AzureDataFactory.TestingFramework/Generated/Models/SqlMISource.cs
index e40bfe5b..49b61be3 100644
--- a/src/AzureDataFactory.TestingFramework/Generated/Models/SqlMISource.cs
+++ b/src/AzureDataFactory.TestingFramework/Generated/Models/SqlMISource.cs
@@ -34,7 +34,7 @@ public SqlMISource()
         /// <param name="produceAdditionalTypes"> Which additional types to produce. </param>
         /// <param name="partitionOption"> The partition mechanism that will be used for Sql read in parallel. Possible values include: "None", "PhysicalPartitionsOfTable", "DynamicRange". </param>
         /// <param name="partitionSettings"> The settings that will be leveraged for Sql source partitioning. </param>
-        internal SqlMISource(string copySourceType, DataFactoryElement<int> sourceRetryCount, DataFactoryElement<string> sourceRetryWait, DataFactoryElement<int> maxConcurrentConnections, DataFactoryElement<bool> disableMetricsCollection, IDictionary<string, BinaryData> additionalProperties, DataFactoryElement<string> queryTimeout, BinaryData additionalColumns, DataFactoryElement<string> sqlReaderQuery, DataFactoryElement<string> sqlReaderStoredProcedureName, BinaryData storedProcedureParameters, DataFactoryElement<string> isolationLevel, BinaryData produceAdditionalTypes, BinaryData partitionOption, SqlPartitionSettings partitionSettings) : base(copySourceType, sourceRetryCount, sourceRetryWait, maxConcurrentConnections, disableMetricsCollection, additionalProperties, queryTimeout, additionalColumns)
+        internal SqlMISource(string copySourceType, DataFactoryElement<int> sourceRetryCount, DataFactoryElement<string> sourceRetryWait, DataFactoryElement<int> maxConcurrentConnections, DataFactoryElement<bool> disableMetricsCollection, IDictionary<string, DataFactoryElement<string>> additionalProperties, DataFactoryElement<string> queryTimeout, BinaryData additionalColumns, DataFactoryElement<string> sqlReaderQuery, DataFactoryElement<string> sqlReaderStoredProcedureName, BinaryData storedProcedureParameters, DataFactoryElement<string> isolationLevel, BinaryData produceAdditionalTypes, BinaryData partitionOption, SqlPartitionSettings partitionSettings) : base(copySourceType, sourceRetryCount, sourceRetryWait, maxConcurrentConnections, disableMetricsCollection, additionalProperties, queryTimeout, additionalColumns)
         {
             SqlReaderQuery = sqlReaderQuery;
             SqlReaderStoredProcedureName = sqlReaderStoredProcedureName;
diff --git a/src/AzureDataFactory.TestingFramework/Generated/Models/SqlServerLinkedService.Serialization.cs b/src/AzureDataFactory.TestingFramework/Generated/Models/SqlServerLinkedService.Serialization.cs
index 15af39d2..5968ec63 100644
--- a/src/AzureDataFactory.TestingFramework/Generated/Models/SqlServerLinkedService.Serialization.cs
+++ b/src/AzureDataFactory.TestingFramework/Generated/Models/SqlServerLinkedService.Serialization.cs
@@ -111,8 +111,8 @@ internal static SqlServerLinkedService DeserializeSqlServerLinkedService(JsonEle
             Optional<DataFactorySecretBaseDefinition> password = default;
             Optional<string> encryptedCredential = default;
             Optional<SqlAlwaysEncryptedProperties> alwaysEncryptedSettings = default;
-            IDictionary<string, BinaryData> additionalProperties = default;
-            Dictionary<string, BinaryData> additionalPropertiesDictionary = new Dictionary<string, BinaryData>();
+            IDictionary<string, DataFactoryElement<string>> additionalProperties = default;
+            Dictionary<string, DataFactoryElement<string>> additionalPropertiesDictionary = new Dictionary<string, DataFactoryElement<string>>();
             foreach (var property in element.EnumerateObject())
             {
                 if (property.NameEquals("type"u8))
@@ -218,7 +218,7 @@ internal static SqlServerLinkedService DeserializeSqlServerLinkedService(JsonEle
                     }
                     continue;
                 }
-                additionalPropertiesDictionary.Add(property.Name, BinaryData.FromString(property.Value.GetRawText()));
+                additionalPropertiesDictionary.Add(property.Name, JsonSerializer.Deserialize<DataFactoryElement<string>>(property.Value.GetRawText()));
             }
             additionalProperties = additionalPropertiesDictionary;
             return new SqlServerLinkedService(type, connectVia.Value, description.Value, Optional.ToDictionary(parameters), Optional.ToList(annotations), additionalProperties, connectionString, userName.Value, password, encryptedCredential.Value, alwaysEncryptedSettings.Value);
diff --git a/src/AzureDataFactory.TestingFramework/Generated/Models/SqlServerLinkedService.cs b/src/AzureDataFactory.TestingFramework/Generated/Models/SqlServerLinkedService.cs
index 6494512a..0325b9fd 100644
--- a/src/AzureDataFactory.TestingFramework/Generated/Models/SqlServerLinkedService.cs
+++ b/src/AzureDataFactory.TestingFramework/Generated/Models/SqlServerLinkedService.cs
@@ -36,7 +36,7 @@ public SqlServerLinkedService(DataFactoryElement<string> connectionString)
         /// <param name="password"> The on-premises Windows authentication password. </param>
         /// <param name="encryptedCredential"> The encrypted credential used for authentication. Credentials are encrypted using the integration runtime credential manager. Type: string. </param>
         /// <param name="alwaysEncryptedSettings"> Sql always encrypted properties. </param>
-        internal SqlServerLinkedService(string linkedServiceType, IntegrationRuntimeReference connectVia, string description, IDictionary<string, EntityParameterSpecification> parameters, IList<BinaryData> annotations, IDictionary<string, BinaryData> additionalProperties, DataFactoryElement<string> connectionString, DataFactoryElement<string> userName, DataFactorySecretBaseDefinition password, string encryptedCredential, SqlAlwaysEncryptedProperties alwaysEncryptedSettings) : base(linkedServiceType, connectVia, description, parameters, annotations, additionalProperties)
+        internal SqlServerLinkedService(string linkedServiceType, IntegrationRuntimeReference connectVia, string description, IDictionary<string, EntityParameterSpecification> parameters, IList<BinaryData> annotations, IDictionary<string, DataFactoryElement<string>> additionalProperties, DataFactoryElement<string> connectionString, DataFactoryElement<string> userName, DataFactorySecretBaseDefinition password, string encryptedCredential, SqlAlwaysEncryptedProperties alwaysEncryptedSettings) : base(linkedServiceType, connectVia, description, parameters, annotations, additionalProperties)
         {
             ConnectionString = connectionString;
             UserName = userName;
diff --git a/src/AzureDataFactory.TestingFramework/Generated/Models/SqlServerSink.Serialization.cs b/src/AzureDataFactory.TestingFramework/Generated/Models/SqlServerSink.Serialization.cs
index afef8633..1dc48d97 100644
--- a/src/AzureDataFactory.TestingFramework/Generated/Models/SqlServerSink.Serialization.cs
+++ b/src/AzureDataFactory.TestingFramework/Generated/Models/SqlServerSink.Serialization.cs
@@ -135,8 +135,8 @@ internal static SqlServerSink DeserializeSqlServerSink(JsonElement element)
             Optional<DataFactoryElement<string>> sinkRetryWait = default;
             Optional<DataFactoryElement<int>> maxConcurrentConnections = default;
             Optional<DataFactoryElement<bool>> disableMetricsCollection = default;
-            IDictionary<string, BinaryData> additionalProperties = default;
-            Dictionary<string, BinaryData> additionalPropertiesDictionary = new Dictionary<string, BinaryData>();
+            IDictionary<string, DataFactoryElement<string>> additionalProperties = default;
+            Dictionary<string, DataFactoryElement<string>> additionalPropertiesDictionary = new Dictionary<string, DataFactoryElement<string>>();
             foreach (var property in element.EnumerateObject())
             {
                 if (property.NameEquals("sqlWriterStoredProcedureName"u8))
@@ -279,7 +279,7 @@ internal static SqlServerSink DeserializeSqlServerSink(JsonElement element)
                     disableMetricsCollection = JsonSerializer.Deserialize<DataFactoryElement<bool>>(property.Value.GetRawText());
                     continue;
                 }
-                additionalPropertiesDictionary.Add(property.Name, BinaryData.FromString(property.Value.GetRawText()));
+                additionalPropertiesDictionary.Add(property.Name, JsonSerializer.Deserialize<DataFactoryElement<string>>(property.Value.GetRawText()));
             }
             additionalProperties = additionalPropertiesDictionary;
             return new SqlServerSink(type, writeBatchSize.Value, writeBatchTimeout.Value, sinkRetryCount.Value, sinkRetryWait.Value, maxConcurrentConnections.Value, disableMetricsCollection.Value, additionalProperties, sqlWriterStoredProcedureName.Value, sqlWriterTableType.Value, preCopyScript.Value, storedProcedureParameters.Value, storedProcedureTableTypeParameterName.Value, tableOption.Value, sqlWriterUseTableLock.Value, writeBehavior.Value, upsertSettings.Value);
diff --git a/src/AzureDataFactory.TestingFramework/Generated/Models/SqlServerSink.cs b/src/AzureDataFactory.TestingFramework/Generated/Models/SqlServerSink.cs
index 729c7e46..3423d5dc 100644
--- a/src/AzureDataFactory.TestingFramework/Generated/Models/SqlServerSink.cs
+++ b/src/AzureDataFactory.TestingFramework/Generated/Models/SqlServerSink.cs
@@ -36,7 +36,7 @@ public SqlServerSink()
         /// <param name="sqlWriterUseTableLock"> Whether to use table lock during bulk copy. Type: boolean (or Expression with resultType boolean). </param>
         /// <param name="writeBehavior"> Write behavior when copying data into sql server. Type: SqlWriteBehaviorEnum (or Expression with resultType SqlWriteBehaviorEnum). </param>
         /// <param name="upsertSettings"> SQL upsert settings. </param>
-        internal SqlServerSink(string copySinkType, DataFactoryElement<int> writeBatchSize, DataFactoryElement<string> writeBatchTimeout, DataFactoryElement<int> sinkRetryCount, DataFactoryElement<string> sinkRetryWait, DataFactoryElement<int> maxConcurrentConnections, DataFactoryElement<bool> disableMetricsCollection, IDictionary<string, BinaryData> additionalProperties, DataFactoryElement<string> sqlWriterStoredProcedureName, DataFactoryElement<string> sqlWriterTableType, DataFactoryElement<string> preCopyScript, BinaryData storedProcedureParameters, DataFactoryElement<string> storedProcedureTableTypeParameterName, DataFactoryElement<string> tableOption, DataFactoryElement<bool> sqlWriterUseTableLock, BinaryData writeBehavior, SqlUpsertSettings upsertSettings) : base(copySinkType, writeBatchSize, writeBatchTimeout, sinkRetryCount, sinkRetryWait, maxConcurrentConnections, disableMetricsCollection, additionalProperties)
+        internal SqlServerSink(string copySinkType, DataFactoryElement<int> writeBatchSize, DataFactoryElement<string> writeBatchTimeout, DataFactoryElement<int> sinkRetryCount, DataFactoryElement<string> sinkRetryWait, DataFactoryElement<int> maxConcurrentConnections, DataFactoryElement<bool> disableMetricsCollection, IDictionary<string, DataFactoryElement<string>> additionalProperties, DataFactoryElement<string> sqlWriterStoredProcedureName, DataFactoryElement<string> sqlWriterTableType, DataFactoryElement<string> preCopyScript, BinaryData storedProcedureParameters, DataFactoryElement<string> storedProcedureTableTypeParameterName, DataFactoryElement<string> tableOption, DataFactoryElement<bool> sqlWriterUseTableLock, BinaryData writeBehavior, SqlUpsertSettings upsertSettings) : base(copySinkType, writeBatchSize, writeBatchTimeout, sinkRetryCount, sinkRetryWait, maxConcurrentConnections, disableMetricsCollection, additionalProperties)
         {
             SqlWriterStoredProcedureName = sqlWriterStoredProcedureName;
             SqlWriterTableType = sqlWriterTableType;
diff --git a/src/AzureDataFactory.TestingFramework/Generated/Models/SqlServerSource.Serialization.cs b/src/AzureDataFactory.TestingFramework/Generated/Models/SqlServerSource.Serialization.cs
index cc2c3f28..61dd749b 100644
--- a/src/AzureDataFactory.TestingFramework/Generated/Models/SqlServerSource.Serialization.cs
+++ b/src/AzureDataFactory.TestingFramework/Generated/Models/SqlServerSource.Serialization.cs
@@ -131,8 +131,8 @@ internal static SqlServerSource DeserializeSqlServerSource(JsonElement element)
             Optional<DataFactoryElement<string>> sourceRetryWait = default;
             Optional<DataFactoryElement<int>> maxConcurrentConnections = default;
             Optional<DataFactoryElement<bool>> disableMetricsCollection = default;
-            IDictionary<string, BinaryData> additionalProperties = default;
-            Dictionary<string, BinaryData> additionalPropertiesDictionary = new Dictionary<string, BinaryData>();
+            IDictionary<string, DataFactoryElement<string>> additionalProperties = default;
+            Dictionary<string, DataFactoryElement<string>> additionalPropertiesDictionary = new Dictionary<string, DataFactoryElement<string>>();
             foreach (var property in element.EnumerateObject())
             {
                 if (property.NameEquals("sqlReaderQuery"u8))
@@ -257,7 +257,7 @@ internal static SqlServerSource DeserializeSqlServerSource(JsonElement element)
                     disableMetricsCollection = JsonSerializer.Deserialize<DataFactoryElement<bool>>(property.Value.GetRawText());
                     continue;
                 }
-                additionalPropertiesDictionary.Add(property.Name, BinaryData.FromString(property.Value.GetRawText()));
+                additionalPropertiesDictionary.Add(property.Name, JsonSerializer.Deserialize<DataFactoryElement<string>>(property.Value.GetRawText()));
             }
             additionalProperties = additionalPropertiesDictionary;
             return new SqlServerSource(type, sourceRetryCount.Value, sourceRetryWait.Value, maxConcurrentConnections.Value, disableMetricsCollection.Value, additionalProperties, queryTimeout.Value, additionalColumns.Value, sqlReaderQuery.Value, sqlReaderStoredProcedureName.Value, storedProcedureParameters.Value, isolationLevel.Value, produceAdditionalTypes.Value, partitionOption.Value, partitionSettings.Value);
diff --git a/src/AzureDataFactory.TestingFramework/Generated/Models/SqlServerSource.cs b/src/AzureDataFactory.TestingFramework/Generated/Models/SqlServerSource.cs
index 322beeea..ef9081c2 100644
--- a/src/AzureDataFactory.TestingFramework/Generated/Models/SqlServerSource.cs
+++ b/src/AzureDataFactory.TestingFramework/Generated/Models/SqlServerSource.cs
@@ -34,7 +34,7 @@ public SqlServerSource()
         /// <param name="produceAdditionalTypes"> Which additional types to produce. </param>
         /// <param name="partitionOption"> The partition mechanism that will be used for Sql read in parallel. Possible values include: "None", "PhysicalPartitionsOfTable", "DynamicRange". </param>
         /// <param name="partitionSettings"> The settings that will be leveraged for Sql source partitioning. </param>
-        internal SqlServerSource(string copySourceType, DataFactoryElement<int> sourceRetryCount, DataFactoryElement<string> sourceRetryWait, DataFactoryElement<int> maxConcurrentConnections, DataFactoryElement<bool> disableMetricsCollection, IDictionary<string, BinaryData> additionalProperties, DataFactoryElement<string> queryTimeout, BinaryData additionalColumns, DataFactoryElement<string> sqlReaderQuery, DataFactoryElement<string> sqlReaderStoredProcedureName, BinaryData storedProcedureParameters, DataFactoryElement<string> isolationLevel, BinaryData produceAdditionalTypes, BinaryData partitionOption, SqlPartitionSettings partitionSettings) : base(copySourceType, sourceRetryCount, sourceRetryWait, maxConcurrentConnections, disableMetricsCollection, additionalProperties, queryTimeout, additionalColumns)
+        internal SqlServerSource(string copySourceType, DataFactoryElement<int> sourceRetryCount, DataFactoryElement<string> sourceRetryWait, DataFactoryElement<int> maxConcurrentConnections, DataFactoryElement<bool> disableMetricsCollection, IDictionary<string, DataFactoryElement<string>> additionalProperties, DataFactoryElement<string> queryTimeout, BinaryData additionalColumns, DataFactoryElement<string> sqlReaderQuery, DataFactoryElement<string> sqlReaderStoredProcedureName, BinaryData storedProcedureParameters, DataFactoryElement<string> isolationLevel, BinaryData produceAdditionalTypes, BinaryData partitionOption, SqlPartitionSettings partitionSettings) : base(copySourceType, sourceRetryCount, sourceRetryWait, maxConcurrentConnections, disableMetricsCollection, additionalProperties, queryTimeout, additionalColumns)
         {
             SqlReaderQuery = sqlReaderQuery;
             SqlReaderStoredProcedureName = sqlReaderStoredProcedureName;
diff --git a/src/AzureDataFactory.TestingFramework/Generated/Models/SqlServerStoredProcedureActivity.Serialization.cs b/src/AzureDataFactory.TestingFramework/Generated/Models/SqlServerStoredProcedureActivity.Serialization.cs
index b83bc0f8..ff6bcf2f 100644
--- a/src/AzureDataFactory.TestingFramework/Generated/Models/SqlServerStoredProcedureActivity.Serialization.cs
+++ b/src/AzureDataFactory.TestingFramework/Generated/Models/SqlServerStoredProcedureActivity.Serialization.cs
@@ -108,8 +108,8 @@ internal static SqlServerStoredProcedureActivity DeserializeSqlServerStoredProce
             Optional<IList<PipelineActivityUserProperty>> userProperties = default;
             DataFactoryElement<string> storedProcedureName = default;
             Optional<BinaryData> storedProcedureParameters = default;
-            IDictionary<string, BinaryData> additionalProperties = default;
-            Dictionary<string, BinaryData> additionalPropertiesDictionary = new Dictionary<string, BinaryData>();
+            IDictionary<string, DataFactoryElement<string>> additionalProperties = default;
+            Dictionary<string, DataFactoryElement<string>> additionalPropertiesDictionary = new Dictionary<string, DataFactoryElement<string>>();
             foreach (var property in element.EnumerateObject())
             {
                 if (property.NameEquals("linkedServiceName"u8))
@@ -217,7 +217,7 @@ internal static SqlServerStoredProcedureActivity DeserializeSqlServerStoredProce
                     }
                     continue;
                 }
-                additionalPropertiesDictionary.Add(property.Name, BinaryData.FromString(property.Value.GetRawText()));
+                additionalPropertiesDictionary.Add(property.Name, JsonSerializer.Deserialize<DataFactoryElement<string>>(property.Value.GetRawText()));
             }
             additionalProperties = additionalPropertiesDictionary;
             return new SqlServerStoredProcedureActivity(name, type, description.Value, Optional.ToNullable(state), Optional.ToNullable(onInactiveMarkAs), Optional.ToList(dependsOn), Optional.ToList(userProperties), additionalProperties, linkedServiceName, policy.Value, storedProcedureName, storedProcedureParameters.Value);
diff --git a/src/AzureDataFactory.TestingFramework/Generated/Models/SqlServerStoredProcedureActivity.cs b/src/AzureDataFactory.TestingFramework/Generated/Models/SqlServerStoredProcedureActivity.cs
index 67c894b9..59829dd8 100644
--- a/src/AzureDataFactory.TestingFramework/Generated/Models/SqlServerStoredProcedureActivity.cs
+++ b/src/AzureDataFactory.TestingFramework/Generated/Models/SqlServerStoredProcedureActivity.cs
@@ -39,7 +39,7 @@ public SqlServerStoredProcedureActivity(string name, DataFactoryElement<string>
         /// <param name="policy"> Activity policy. </param>
         /// <param name="storedProcedureName"> Stored procedure name. Type: string (or Expression with resultType string). </param>
         /// <param name="storedProcedureParameters"> Value and type setting for stored procedure parameters. Example: "{Parameter1: {value: "1", type: "int"}}". </param>
-        internal SqlServerStoredProcedureActivity(string name, string activityType, string description, PipelineActivityState? state, ActivityOnInactiveMarkAs? onInactiveMarkAs, IList<PipelineActivityDependency> dependsOn, IList<PipelineActivityUserProperty> userProperties, IDictionary<string, BinaryData> additionalProperties, DataFactoryLinkedServiceReference linkedServiceName, PipelineActivityPolicy policy, DataFactoryElement<string> storedProcedureName, BinaryData storedProcedureParameters) : base(name, activityType, description, state, onInactiveMarkAs, dependsOn, userProperties, additionalProperties, linkedServiceName, policy)
+        internal SqlServerStoredProcedureActivity(string name, string activityType, string description, PipelineActivityState? state, ActivityOnInactiveMarkAs? onInactiveMarkAs, IList<PipelineActivityDependency> dependsOn, IList<PipelineActivityUserProperty> userProperties, IDictionary<string, DataFactoryElement<string>> additionalProperties, DataFactoryLinkedServiceReference linkedServiceName, PipelineActivityPolicy policy, DataFactoryElement<string> storedProcedureName, BinaryData storedProcedureParameters) : base(name, activityType, description, state, onInactiveMarkAs, dependsOn, userProperties, additionalProperties, linkedServiceName, policy)
         {
             StoredProcedureName = storedProcedureName;
             StoredProcedureParameters = storedProcedureParameters;
diff --git a/src/AzureDataFactory.TestingFramework/Generated/Models/SqlServerTableDataset.Serialization.cs b/src/AzureDataFactory.TestingFramework/Generated/Models/SqlServerTableDataset.Serialization.cs
index 296fd0f3..f59f02fd 100644
--- a/src/AzureDataFactory.TestingFramework/Generated/Models/SqlServerTableDataset.Serialization.cs
+++ b/src/AzureDataFactory.TestingFramework/Generated/Models/SqlServerTableDataset.Serialization.cs
@@ -120,8 +120,8 @@ internal static SqlServerTableDataset DeserializeSqlServerTableDataset(JsonEleme
             Optional<BinaryData> tableName = default;
             Optional<DataFactoryElement<string>> schema0 = default;
             Optional<DataFactoryElement<string>> table = default;
-            IDictionary<string, BinaryData> additionalProperties = default;
-            Dictionary<string, BinaryData> additionalPropertiesDictionary = new Dictionary<string, BinaryData>();
+            IDictionary<string, DataFactoryElement<string>> additionalProperties = default;
+            Dictionary<string, DataFactoryElement<string>> additionalPropertiesDictionary = new Dictionary<string, DataFactoryElement<string>>();
             foreach (var property in element.EnumerateObject())
             {
                 if (property.NameEquals("type"u8))
@@ -240,7 +240,7 @@ internal static SqlServerTableDataset DeserializeSqlServerTableDataset(JsonEleme
                     }
                     continue;
                 }
-                additionalPropertiesDictionary.Add(property.Name, BinaryData.FromString(property.Value.GetRawText()));
+                additionalPropertiesDictionary.Add(property.Name, JsonSerializer.Deserialize<DataFactoryElement<string>>(property.Value.GetRawText()));
             }
             additionalProperties = additionalPropertiesDictionary;
             return new SqlServerTableDataset(type, description.Value, structure.Value, schema.Value, linkedServiceName, Optional.ToDictionary(parameters), Optional.ToList(annotations), folder.Value, additionalProperties, tableName.Value, schema0.Value, table.Value);
diff --git a/src/AzureDataFactory.TestingFramework/Generated/Models/SqlServerTableDataset.cs b/src/AzureDataFactory.TestingFramework/Generated/Models/SqlServerTableDataset.cs
index 191ab9ce..f7454349 100644
--- a/src/AzureDataFactory.TestingFramework/Generated/Models/SqlServerTableDataset.cs
+++ b/src/AzureDataFactory.TestingFramework/Generated/Models/SqlServerTableDataset.cs
@@ -36,7 +36,7 @@ public SqlServerTableDataset(DataFactoryLinkedServiceReference linkedServiceName
         /// <param name="tableName"> This property will be retired. Please consider using schema + table properties instead. </param>
         /// <param name="schemaTypePropertiesSchema"> The schema name of the SQL Server dataset. Type: string (or Expression with resultType string). </param>
         /// <param name="table"> The table name of the SQL Server dataset. Type: string (or Expression with resultType string). </param>
-        internal SqlServerTableDataset(string datasetType, string description, DataFactoryElement<IList<DatasetDataElement>> structure, DataFactoryElement<IList<DatasetSchemaDataElement>> schema, DataFactoryLinkedServiceReference linkedServiceName, IDictionary<string, EntityParameterSpecification> parameters, IList<BinaryData> annotations, DatasetFolder folder, IDictionary<string, BinaryData> additionalProperties, BinaryData tableName, DataFactoryElement<string> schemaTypePropertiesSchema, DataFactoryElement<string> table) : base(datasetType, description, structure, schema, linkedServiceName, parameters, annotations, folder, additionalProperties)
+        internal SqlServerTableDataset(string datasetType, string description, DataFactoryElement<IList<DatasetDataElement>> structure, DataFactoryElement<IList<DatasetSchemaDataElement>> schema, DataFactoryLinkedServiceReference linkedServiceName, IDictionary<string, EntityParameterSpecification> parameters, IList<BinaryData> annotations, DatasetFolder folder, IDictionary<string, DataFactoryElement<string>> additionalProperties, BinaryData tableName, DataFactoryElement<string> schemaTypePropertiesSchema, DataFactoryElement<string> table) : base(datasetType, description, structure, schema, linkedServiceName, parameters, annotations, folder, additionalProperties)
         {
             TableName = tableName;
             SchemaTypePropertiesSchema = schemaTypePropertiesSchema;
diff --git a/src/AzureDataFactory.TestingFramework/Generated/Models/SqlSink.Serialization.cs b/src/AzureDataFactory.TestingFramework/Generated/Models/SqlSink.Serialization.cs
index 54831adb..208aacc9 100644
--- a/src/AzureDataFactory.TestingFramework/Generated/Models/SqlSink.Serialization.cs
+++ b/src/AzureDataFactory.TestingFramework/Generated/Models/SqlSink.Serialization.cs
@@ -135,8 +135,8 @@ internal static SqlSink DeserializeSqlSink(JsonElement element)
             Optional<DataFactoryElement<string>> sinkRetryWait = default;
             Optional<DataFactoryElement<int>> maxConcurrentConnections = default;
             Optional<DataFactoryElement<bool>> disableMetricsCollection = default;
-            IDictionary<string, BinaryData> additionalProperties = default;
-            Dictionary<string, BinaryData> additionalPropertiesDictionary = new Dictionary<string, BinaryData>();
+            IDictionary<string, DataFactoryElement<string>> additionalProperties = default;
+            Dictionary<string, DataFactoryElement<string>> additionalPropertiesDictionary = new Dictionary<string, DataFactoryElement<string>>();
             foreach (var property in element.EnumerateObject())
             {
                 if (property.NameEquals("sqlWriterStoredProcedureName"u8))
@@ -279,7 +279,7 @@ internal static SqlSink DeserializeSqlSink(JsonElement element)
                     disableMetricsCollection = JsonSerializer.Deserialize<DataFactoryElement<bool>>(property.Value.GetRawText());
                     continue;
                 }
-                additionalPropertiesDictionary.Add(property.Name, BinaryData.FromString(property.Value.GetRawText()));
+                additionalPropertiesDictionary.Add(property.Name, JsonSerializer.Deserialize<DataFactoryElement<string>>(property.Value.GetRawText()));
             }
             additionalProperties = additionalPropertiesDictionary;
             return new SqlSink(type, writeBatchSize.Value, writeBatchTimeout.Value, sinkRetryCount.Value, sinkRetryWait.Value, maxConcurrentConnections.Value, disableMetricsCollection.Value, additionalProperties, sqlWriterStoredProcedureName.Value, sqlWriterTableType.Value, preCopyScript.Value, storedProcedureParameters.Value, storedProcedureTableTypeParameterName.Value, tableOption.Value, sqlWriterUseTableLock.Value, writeBehavior.Value, upsertSettings.Value);
diff --git a/src/AzureDataFactory.TestingFramework/Generated/Models/SqlSink.cs b/src/AzureDataFactory.TestingFramework/Generated/Models/SqlSink.cs
index 0c366492..b2e8be86 100644
--- a/src/AzureDataFactory.TestingFramework/Generated/Models/SqlSink.cs
+++ b/src/AzureDataFactory.TestingFramework/Generated/Models/SqlSink.cs
@@ -36,7 +36,7 @@ public SqlSink()
         /// <param name="sqlWriterUseTableLock"> Whether to use table lock during bulk copy. Type: boolean (or Expression with resultType boolean). </param>
         /// <param name="writeBehavior"> Write behavior when copying data into sql. Type: SqlWriteBehaviorEnum (or Expression with resultType SqlWriteBehaviorEnum). </param>
         /// <param name="upsertSettings"> SQL upsert settings. </param>
-        internal SqlSink(string copySinkType, DataFactoryElement<int> writeBatchSize, DataFactoryElement<string> writeBatchTimeout, DataFactoryElement<int> sinkRetryCount, DataFactoryElement<string> sinkRetryWait, DataFactoryElement<int> maxConcurrentConnections, DataFactoryElement<bool> disableMetricsCollection, IDictionary<string, BinaryData> additionalProperties, DataFactoryElement<string> sqlWriterStoredProcedureName, DataFactoryElement<string> sqlWriterTableType, DataFactoryElement<string> preCopyScript, BinaryData storedProcedureParameters, DataFactoryElement<string> storedProcedureTableTypeParameterName, DataFactoryElement<string> tableOption, DataFactoryElement<bool> sqlWriterUseTableLock, BinaryData writeBehavior, SqlUpsertSettings upsertSettings) : base(copySinkType, writeBatchSize, writeBatchTimeout, sinkRetryCount, sinkRetryWait, maxConcurrentConnections, disableMetricsCollection, additionalProperties)
+        internal SqlSink(string copySinkType, DataFactoryElement<int> writeBatchSize, DataFactoryElement<string> writeBatchTimeout, DataFactoryElement<int> sinkRetryCount, DataFactoryElement<string> sinkRetryWait, DataFactoryElement<int> maxConcurrentConnections, DataFactoryElement<bool> disableMetricsCollection, IDictionary<string, DataFactoryElement<string>> additionalProperties, DataFactoryElement<string> sqlWriterStoredProcedureName, DataFactoryElement<string> sqlWriterTableType, DataFactoryElement<string> preCopyScript, BinaryData storedProcedureParameters, DataFactoryElement<string> storedProcedureTableTypeParameterName, DataFactoryElement<string> tableOption, DataFactoryElement<bool> sqlWriterUseTableLock, BinaryData writeBehavior, SqlUpsertSettings upsertSettings) : base(copySinkType, writeBatchSize, writeBatchTimeout, sinkRetryCount, sinkRetryWait, maxConcurrentConnections, disableMetricsCollection, additionalProperties)
         {
             SqlWriterStoredProcedureName = sqlWriterStoredProcedureName;
             SqlWriterTableType = sqlWriterTableType;
diff --git a/src/AzureDataFactory.TestingFramework/Generated/Models/SqlSource.Serialization.cs b/src/AzureDataFactory.TestingFramework/Generated/Models/SqlSource.Serialization.cs
index 809d90fc..910e27b5 100644
--- a/src/AzureDataFactory.TestingFramework/Generated/Models/SqlSource.Serialization.cs
+++ b/src/AzureDataFactory.TestingFramework/Generated/Models/SqlSource.Serialization.cs
@@ -121,8 +121,8 @@ internal static SqlSource DeserializeSqlSource(JsonElement element)
             Optional<DataFactoryElement<string>> sourceRetryWait = default;
             Optional<DataFactoryElement<int>> maxConcurrentConnections = default;
             Optional<DataFactoryElement<bool>> disableMetricsCollection = default;
-            IDictionary<string, BinaryData> additionalProperties = default;
-            Dictionary<string, BinaryData> additionalPropertiesDictionary = new Dictionary<string, BinaryData>();
+            IDictionary<string, DataFactoryElement<string>> additionalProperties = default;
+            Dictionary<string, DataFactoryElement<string>> additionalPropertiesDictionary = new Dictionary<string, DataFactoryElement<string>>();
             foreach (var property in element.EnumerateObject())
             {
                 if (property.NameEquals("sqlReaderQuery"u8))
@@ -238,7 +238,7 @@ internal static SqlSource DeserializeSqlSource(JsonElement element)
                     disableMetricsCollection = JsonSerializer.Deserialize<DataFactoryElement<bool>>(property.Value.GetRawText());
                     continue;
                 }
-                additionalPropertiesDictionary.Add(property.Name, BinaryData.FromString(property.Value.GetRawText()));
+                additionalPropertiesDictionary.Add(property.Name, JsonSerializer.Deserialize<DataFactoryElement<string>>(property.Value.GetRawText()));
             }
             additionalProperties = additionalPropertiesDictionary;
             return new SqlSource(type, sourceRetryCount.Value, sourceRetryWait.Value, maxConcurrentConnections.Value, disableMetricsCollection.Value, additionalProperties, queryTimeout.Value, additionalColumns.Value, sqlReaderQuery.Value, sqlReaderStoredProcedureName.Value, storedProcedureParameters.Value, isolationLevel.Value, partitionOption.Value, partitionSettings.Value);
diff --git a/src/AzureDataFactory.TestingFramework/Generated/Models/SqlSource.cs b/src/AzureDataFactory.TestingFramework/Generated/Models/SqlSource.cs
index b7695d2f..855a8aaa 100644
--- a/src/AzureDataFactory.TestingFramework/Generated/Models/SqlSource.cs
+++ b/src/AzureDataFactory.TestingFramework/Generated/Models/SqlSource.cs
@@ -33,7 +33,7 @@ public SqlSource()
         /// <param name="isolationLevel"> Specifies the transaction locking behavior for the SQL source. Allowed values: ReadCommitted/ReadUncommitted/RepeatableRead/Serializable/Snapshot. The default value is ReadCommitted. Type: string (or Expression with resultType string). </param>
         /// <param name="partitionOption"> The partition mechanism that will be used for Sql read in parallel. Possible values include: "None", "PhysicalPartitionsOfTable", "DynamicRange". </param>
         /// <param name="partitionSettings"> The settings that will be leveraged for Sql source partitioning. </param>
-        internal SqlSource(string copySourceType, DataFactoryElement<int> sourceRetryCount, DataFactoryElement<string> sourceRetryWait, DataFactoryElement<int> maxConcurrentConnections, DataFactoryElement<bool> disableMetricsCollection, IDictionary<string, BinaryData> additionalProperties, DataFactoryElement<string> queryTimeout, BinaryData additionalColumns, DataFactoryElement<string> sqlReaderQuery, DataFactoryElement<string> sqlReaderStoredProcedureName, BinaryData storedProcedureParameters, DataFactoryElement<string> isolationLevel, BinaryData partitionOption, SqlPartitionSettings partitionSettings) : base(copySourceType, sourceRetryCount, sourceRetryWait, maxConcurrentConnections, disableMetricsCollection, additionalProperties, queryTimeout, additionalColumns)
+        internal SqlSource(string copySourceType, DataFactoryElement<int> sourceRetryCount, DataFactoryElement<string> sourceRetryWait, DataFactoryElement<int> maxConcurrentConnections, DataFactoryElement<bool> disableMetricsCollection, IDictionary<string, DataFactoryElement<string>> additionalProperties, DataFactoryElement<string> queryTimeout, BinaryData additionalColumns, DataFactoryElement<string> sqlReaderQuery, DataFactoryElement<string> sqlReaderStoredProcedureName, BinaryData storedProcedureParameters, DataFactoryElement<string> isolationLevel, BinaryData partitionOption, SqlPartitionSettings partitionSettings) : base(copySourceType, sourceRetryCount, sourceRetryWait, maxConcurrentConnections, disableMetricsCollection, additionalProperties, queryTimeout, additionalColumns)
         {
             SqlReaderQuery = sqlReaderQuery;
             SqlReaderStoredProcedureName = sqlReaderStoredProcedureName;
diff --git a/src/AzureDataFactory.TestingFramework/Generated/Models/SquareLinkedService.Serialization.cs b/src/AzureDataFactory.TestingFramework/Generated/Models/SquareLinkedService.Serialization.cs
index 0659658f..14b09a5c 100644
--- a/src/AzureDataFactory.TestingFramework/Generated/Models/SquareLinkedService.Serialization.cs
+++ b/src/AzureDataFactory.TestingFramework/Generated/Models/SquareLinkedService.Serialization.cs
@@ -142,8 +142,8 @@ internal static SquareLinkedService DeserializeSquareLinkedService(JsonElement e
             Optional<DataFactoryElement<bool>> useHostVerification = default;
             Optional<DataFactoryElement<bool>> usePeerVerification = default;
             Optional<string> encryptedCredential = default;
-            IDictionary<string, BinaryData> additionalProperties = default;
-            Dictionary<string, BinaryData> additionalPropertiesDictionary = new Dictionary<string, BinaryData>();
+            IDictionary<string, DataFactoryElement<string>> additionalProperties = default;
+            Dictionary<string, DataFactoryElement<string>> additionalPropertiesDictionary = new Dictionary<string, DataFactoryElement<string>>();
             foreach (var property in element.EnumerateObject())
             {
                 if (property.NameEquals("type"u8))
@@ -289,7 +289,7 @@ internal static SquareLinkedService DeserializeSquareLinkedService(JsonElement e
                     }
                     continue;
                 }
-                additionalPropertiesDictionary.Add(property.Name, BinaryData.FromString(property.Value.GetRawText()));
+                additionalPropertiesDictionary.Add(property.Name, JsonSerializer.Deserialize<DataFactoryElement<string>>(property.Value.GetRawText()));
             }
             additionalProperties = additionalPropertiesDictionary;
             return new SquareLinkedService(type, connectVia.Value, description.Value, Optional.ToDictionary(parameters), Optional.ToList(annotations), additionalProperties, connectionProperties.Value, host.Value, clientId.Value, clientSecret, redirectUri.Value, useEncryptedEndpoints.Value, useHostVerification.Value, usePeerVerification.Value, encryptedCredential.Value);
diff --git a/src/AzureDataFactory.TestingFramework/Generated/Models/SquareLinkedService.cs b/src/AzureDataFactory.TestingFramework/Generated/Models/SquareLinkedService.cs
index ed91913a..e4c9fee2 100644
--- a/src/AzureDataFactory.TestingFramework/Generated/Models/SquareLinkedService.cs
+++ b/src/AzureDataFactory.TestingFramework/Generated/Models/SquareLinkedService.cs
@@ -34,7 +34,7 @@ public SquareLinkedService()
         /// <param name="useHostVerification"> Specifies whether to require the host name in the server's certificate to match the host name of the server when connecting over SSL. The default value is true. </param>
         /// <param name="usePeerVerification"> Specifies whether to verify the identity of the server when connecting over SSL. The default value is true. </param>
         /// <param name="encryptedCredential"> The encrypted credential used for authentication. Credentials are encrypted using the integration runtime credential manager. Type: string. </param>
-        internal SquareLinkedService(string linkedServiceType, IntegrationRuntimeReference connectVia, string description, IDictionary<string, EntityParameterSpecification> parameters, IList<BinaryData> annotations, IDictionary<string, BinaryData> additionalProperties, BinaryData connectionProperties, DataFactoryElement<string> host, DataFactoryElement<string> clientId, DataFactorySecretBaseDefinition clientSecret, DataFactoryElement<string> redirectUri, DataFactoryElement<bool> useEncryptedEndpoints, DataFactoryElement<bool> useHostVerification, DataFactoryElement<bool> usePeerVerification, string encryptedCredential) : base(linkedServiceType, connectVia, description, parameters, annotations, additionalProperties)
+        internal SquareLinkedService(string linkedServiceType, IntegrationRuntimeReference connectVia, string description, IDictionary<string, EntityParameterSpecification> parameters, IList<BinaryData> annotations, IDictionary<string, DataFactoryElement<string>> additionalProperties, BinaryData connectionProperties, DataFactoryElement<string> host, DataFactoryElement<string> clientId, DataFactorySecretBaseDefinition clientSecret, DataFactoryElement<string> redirectUri, DataFactoryElement<bool> useEncryptedEndpoints, DataFactoryElement<bool> useHostVerification, DataFactoryElement<bool> usePeerVerification, string encryptedCredential) : base(linkedServiceType, connectVia, description, parameters, annotations, additionalProperties)
         {
             ConnectionProperties = connectionProperties;
             Host = host;
diff --git a/src/AzureDataFactory.TestingFramework/Generated/Models/SquareObjectDataset.Serialization.cs b/src/AzureDataFactory.TestingFramework/Generated/Models/SquareObjectDataset.Serialization.cs
index 060b7e3a..8a6a7f03 100644
--- a/src/AzureDataFactory.TestingFramework/Generated/Models/SquareObjectDataset.Serialization.cs
+++ b/src/AzureDataFactory.TestingFramework/Generated/Models/SquareObjectDataset.Serialization.cs
@@ -104,8 +104,8 @@ internal static SquareObjectDataset DeserializeSquareObjectDataset(JsonElement e
             Optional<IList<BinaryData>> annotations = default;
             Optional<DatasetFolder> folder = default;
             Optional<DataFactoryElement<string>> tableName = default;
-            IDictionary<string, BinaryData> additionalProperties = default;
-            Dictionary<string, BinaryData> additionalPropertiesDictionary = new Dictionary<string, BinaryData>();
+            IDictionary<string, DataFactoryElement<string>> additionalProperties = default;
+            Dictionary<string, DataFactoryElement<string>> additionalPropertiesDictionary = new Dictionary<string, DataFactoryElement<string>>();
             foreach (var property in element.EnumerateObject())
             {
                 if (property.NameEquals("type"u8))
@@ -206,7 +206,7 @@ internal static SquareObjectDataset DeserializeSquareObjectDataset(JsonElement e
                     }
                     continue;
                 }
-                additionalPropertiesDictionary.Add(property.Name, BinaryData.FromString(property.Value.GetRawText()));
+                additionalPropertiesDictionary.Add(property.Name, JsonSerializer.Deserialize<DataFactoryElement<string>>(property.Value.GetRawText()));
             }
             additionalProperties = additionalPropertiesDictionary;
             return new SquareObjectDataset(type, description.Value, structure.Value, schema.Value, linkedServiceName, Optional.ToDictionary(parameters), Optional.ToList(annotations), folder.Value, additionalProperties, tableName.Value);
diff --git a/src/AzureDataFactory.TestingFramework/Generated/Models/SquareObjectDataset.cs b/src/AzureDataFactory.TestingFramework/Generated/Models/SquareObjectDataset.cs
index 6e604cae..9f96a64a 100644
--- a/src/AzureDataFactory.TestingFramework/Generated/Models/SquareObjectDataset.cs
+++ b/src/AzureDataFactory.TestingFramework/Generated/Models/SquareObjectDataset.cs
@@ -34,7 +34,7 @@ public SquareObjectDataset(DataFactoryLinkedServiceReference linkedServiceName)
         /// <param name="folder"> The folder that this Dataset is in. If not specified, Dataset will appear at the root level. </param>
         /// <param name="additionalProperties"> Additional Properties. </param>
         /// <param name="tableName"> The table name. Type: string (or Expression with resultType string). </param>
-        internal SquareObjectDataset(string datasetType, string description, DataFactoryElement<IList<DatasetDataElement>> structure, DataFactoryElement<IList<DatasetSchemaDataElement>> schema, DataFactoryLinkedServiceReference linkedServiceName, IDictionary<string, EntityParameterSpecification> parameters, IList<BinaryData> annotations, DatasetFolder folder, IDictionary<string, BinaryData> additionalProperties, DataFactoryElement<string> tableName) : base(datasetType, description, structure, schema, linkedServiceName, parameters, annotations, folder, additionalProperties)
+        internal SquareObjectDataset(string datasetType, string description, DataFactoryElement<IList<DatasetDataElement>> structure, DataFactoryElement<IList<DatasetSchemaDataElement>> schema, DataFactoryLinkedServiceReference linkedServiceName, IDictionary<string, EntityParameterSpecification> parameters, IList<BinaryData> annotations, DatasetFolder folder, IDictionary<string, DataFactoryElement<string>> additionalProperties, DataFactoryElement<string> tableName) : base(datasetType, description, structure, schema, linkedServiceName, parameters, annotations, folder, additionalProperties)
         {
             TableName = tableName;
             DatasetType = datasetType ?? "SquareObject";
diff --git a/src/AzureDataFactory.TestingFramework/Generated/Models/SquareSource.Serialization.cs b/src/AzureDataFactory.TestingFramework/Generated/Models/SquareSource.Serialization.cs
index eebc24c5..c40117ad 100644
--- a/src/AzureDataFactory.TestingFramework/Generated/Models/SquareSource.Serialization.cs
+++ b/src/AzureDataFactory.TestingFramework/Generated/Models/SquareSource.Serialization.cs
@@ -83,8 +83,8 @@ internal static SquareSource DeserializeSquareSource(JsonElement element)
             Optional<DataFactoryElement<string>> sourceRetryWait = default;
             Optional<DataFactoryElement<int>> maxConcurrentConnections = default;
             Optional<DataFactoryElement<bool>> disableMetricsCollection = default;
-            IDictionary<string, BinaryData> additionalProperties = default;
-            Dictionary<string, BinaryData> additionalPropertiesDictionary = new Dictionary<string, BinaryData>();
+            IDictionary<string, DataFactoryElement<string>> additionalProperties = default;
+            Dictionary<string, DataFactoryElement<string>> additionalPropertiesDictionary = new Dictionary<string, DataFactoryElement<string>>();
             foreach (var property in element.EnumerateObject())
             {
                 if (property.NameEquals("query"u8))
@@ -155,7 +155,7 @@ internal static SquareSource DeserializeSquareSource(JsonElement element)
                     disableMetricsCollection = JsonSerializer.Deserialize<DataFactoryElement<bool>>(property.Value.GetRawText());
                     continue;
                 }
-                additionalPropertiesDictionary.Add(property.Name, BinaryData.FromString(property.Value.GetRawText()));
+                additionalPropertiesDictionary.Add(property.Name, JsonSerializer.Deserialize<DataFactoryElement<string>>(property.Value.GetRawText()));
             }
             additionalProperties = additionalPropertiesDictionary;
             return new SquareSource(type, sourceRetryCount.Value, sourceRetryWait.Value, maxConcurrentConnections.Value, disableMetricsCollection.Value, additionalProperties, queryTimeout.Value, additionalColumns.Value, query.Value);
diff --git a/src/AzureDataFactory.TestingFramework/Generated/Models/SquareSource.cs b/src/AzureDataFactory.TestingFramework/Generated/Models/SquareSource.cs
index dc7b2cd7..6331a0b1 100644
--- a/src/AzureDataFactory.TestingFramework/Generated/Models/SquareSource.cs
+++ b/src/AzureDataFactory.TestingFramework/Generated/Models/SquareSource.cs
@@ -28,7 +28,7 @@ public SquareSource()
         /// <param name="queryTimeout"> Query timeout. Type: string (or Expression with resultType string), pattern: ((\d+)\.)?(\d\d):(60|([0-5][0-9])):(60|([0-5][0-9])). </param>
         /// <param name="additionalColumns"> Specifies the additional columns to be added to source data. Type: array of objects(AdditionalColumns) (or Expression with resultType array of objects). </param>
         /// <param name="query"> A query to retrieve data from source. Type: string (or Expression with resultType string). </param>
-        internal SquareSource(string copySourceType, DataFactoryElement<int> sourceRetryCount, DataFactoryElement<string> sourceRetryWait, DataFactoryElement<int> maxConcurrentConnections, DataFactoryElement<bool> disableMetricsCollection, IDictionary<string, BinaryData> additionalProperties, DataFactoryElement<string> queryTimeout, BinaryData additionalColumns, DataFactoryElement<string> query) : base(copySourceType, sourceRetryCount, sourceRetryWait, maxConcurrentConnections, disableMetricsCollection, additionalProperties, queryTimeout, additionalColumns)
+        internal SquareSource(string copySourceType, DataFactoryElement<int> sourceRetryCount, DataFactoryElement<string> sourceRetryWait, DataFactoryElement<int> maxConcurrentConnections, DataFactoryElement<bool> disableMetricsCollection, IDictionary<string, DataFactoryElement<string>> additionalProperties, DataFactoryElement<string> queryTimeout, BinaryData additionalColumns, DataFactoryElement<string> query) : base(copySourceType, sourceRetryCount, sourceRetryWait, maxConcurrentConnections, disableMetricsCollection, additionalProperties, queryTimeout, additionalColumns)
         {
             Query = query;
             CopySourceType = copySourceType ?? "SquareSource";
diff --git a/src/AzureDataFactory.TestingFramework/Generated/Models/StagingSettings.Serialization.cs b/src/AzureDataFactory.TestingFramework/Generated/Models/StagingSettings.Serialization.cs
index 4dd84f5c..a6dfb728 100644
--- a/src/AzureDataFactory.TestingFramework/Generated/Models/StagingSettings.Serialization.cs
+++ b/src/AzureDataFactory.TestingFramework/Generated/Models/StagingSettings.Serialization.cs
@@ -48,8 +48,8 @@ internal static StagingSettings DeserializeStagingSettings(JsonElement element)
             DataFactoryLinkedServiceReference linkedServiceName = default;
             Optional<DataFactoryElement<string>> path = default;
             Optional<DataFactoryElement<bool>> enableCompression = default;
-            IDictionary<string, BinaryData> additionalProperties = default;
-            Dictionary<string, BinaryData> additionalPropertiesDictionary = new Dictionary<string, BinaryData>();
+            IDictionary<string, DataFactoryElement<string>> additionalProperties = default;
+            Dictionary<string, DataFactoryElement<string>> additionalPropertiesDictionary = new Dictionary<string, DataFactoryElement<string>>();
             foreach (var property in element.EnumerateObject())
             {
                 if (property.NameEquals("linkedServiceName"u8))
@@ -75,7 +75,7 @@ internal static StagingSettings DeserializeStagingSettings(JsonElement element)
                     enableCompression = JsonSerializer.Deserialize<DataFactoryElement<bool>>(property.Value.GetRawText());
                     continue;
                 }
-                additionalPropertiesDictionary.Add(property.Name, BinaryData.FromString(property.Value.GetRawText()));
+                additionalPropertiesDictionary.Add(property.Name, JsonSerializer.Deserialize<DataFactoryElement<string>>(property.Value.GetRawText()));
             }
             additionalProperties = additionalPropertiesDictionary;
             return new StagingSettings(linkedServiceName, path.Value, enableCompression.Value, additionalProperties);
diff --git a/src/AzureDataFactory.TestingFramework/Generated/Models/StagingSettings.cs b/src/AzureDataFactory.TestingFramework/Generated/Models/StagingSettings.cs
index f945fdc6..21078a0e 100644
--- a/src/AzureDataFactory.TestingFramework/Generated/Models/StagingSettings.cs
+++ b/src/AzureDataFactory.TestingFramework/Generated/Models/StagingSettings.cs
@@ -21,7 +21,7 @@ public StagingSettings(DataFactoryLinkedServiceReference linkedServiceName)
             Argument.AssertNotNull(linkedServiceName, nameof(linkedServiceName));
 
             LinkedServiceName = linkedServiceName;
-            AdditionalProperties = new ChangeTrackingDictionary<string, BinaryData>();
+            AdditionalProperties = new ChangeTrackingDictionary<string, DataFactoryElement<string>>();
         }
 
         /// <summary> Initializes a new instance of StagingSettings. </summary>
@@ -29,7 +29,7 @@ public StagingSettings(DataFactoryLinkedServiceReference linkedServiceName)
         /// <param name="path"> The path to storage for storing the interim data. Type: string (or Expression with resultType string). </param>
         /// <param name="enableCompression"> Specifies whether to use compression when copying data via an interim staging. Default value is false. Type: boolean (or Expression with resultType boolean). </param>
         /// <param name="additionalProperties"> Additional Properties. </param>
-        internal StagingSettings(DataFactoryLinkedServiceReference linkedServiceName, DataFactoryElement<string> path, DataFactoryElement<bool> enableCompression, IDictionary<string, BinaryData> additionalProperties)
+        internal StagingSettings(DataFactoryLinkedServiceReference linkedServiceName, DataFactoryElement<string> path, DataFactoryElement<bool> enableCompression, IDictionary<string, DataFactoryElement<string>> additionalProperties)
         {
             LinkedServiceName = linkedServiceName;
             Path = path;
@@ -73,6 +73,6 @@ internal StagingSettings(DataFactoryLinkedServiceReference linkedServiceName, Da
         /// </list>
         /// </para>
         /// </summary>
-        public IDictionary<string, BinaryData> AdditionalProperties { get; }
+        public IDictionary<string, DataFactoryElement<string>> AdditionalProperties { get; }
     }
 }
diff --git a/src/AzureDataFactory.TestingFramework/Generated/Models/StoreReadSettings.cs b/src/AzureDataFactory.TestingFramework/Generated/Models/StoreReadSettings.cs
index b302ec7b..752ab193 100644
--- a/src/AzureDataFactory.TestingFramework/Generated/Models/StoreReadSettings.cs
+++ b/src/AzureDataFactory.TestingFramework/Generated/Models/StoreReadSettings.cs
@@ -20,7 +20,7 @@ public partial class StoreReadSettings
         /// <summary> Initializes a new instance of StoreReadSettings. </summary>
         public StoreReadSettings()
         {
-            AdditionalProperties = new ChangeTrackingDictionary<string, BinaryData>();
+            AdditionalProperties = new ChangeTrackingDictionary<string, DataFactoryElement<string>>();
         }
 
         /// <summary> Initializes a new instance of StoreReadSettings. </summary>
@@ -28,7 +28,7 @@ public StoreReadSettings()
         /// <param name="maxConcurrentConnections"> The maximum concurrent connection count for the source data store. Type: integer (or Expression with resultType integer). </param>
         /// <param name="disableMetricsCollection"> If true, disable data store metrics collection. Default is false. Type: boolean (or Expression with resultType boolean). </param>
         /// <param name="additionalProperties"> Additional Properties. </param>
-        internal StoreReadSettings(string storeReadSettingsType, DataFactoryElement<int> maxConcurrentConnections, DataFactoryElement<bool> disableMetricsCollection, IDictionary<string, BinaryData> additionalProperties)
+        internal StoreReadSettings(string storeReadSettingsType, DataFactoryElement<int> maxConcurrentConnections, DataFactoryElement<bool> disableMetricsCollection, IDictionary<string, DataFactoryElement<string>> additionalProperties)
         {
             StoreReadSettingsType = storeReadSettingsType;
             MaxConcurrentConnections = maxConcurrentConnections;
@@ -72,6 +72,6 @@ internal StoreReadSettings(string storeReadSettingsType, DataFactoryElement<int>
         /// </list>
         /// </para>
         /// </summary>
-        public IDictionary<string, BinaryData> AdditionalProperties { get; }
+        public IDictionary<string, DataFactoryElement<string>> AdditionalProperties { get; }
     }
 }
diff --git a/src/AzureDataFactory.TestingFramework/Generated/Models/StoreWriteSettings.cs b/src/AzureDataFactory.TestingFramework/Generated/Models/StoreWriteSettings.cs
index 5063dbc2..bba608bb 100644
--- a/src/AzureDataFactory.TestingFramework/Generated/Models/StoreWriteSettings.cs
+++ b/src/AzureDataFactory.TestingFramework/Generated/Models/StoreWriteSettings.cs
@@ -20,7 +20,7 @@ public partial class StoreWriteSettings
         /// <summary> Initializes a new instance of StoreWriteSettings. </summary>
         public StoreWriteSettings()
         {
-            AdditionalProperties = new ChangeTrackingDictionary<string, BinaryData>();
+            AdditionalProperties = new ChangeTrackingDictionary<string, DataFactoryElement<string>>();
         }
 
         /// <summary> Initializes a new instance of StoreWriteSettings. </summary>
@@ -29,7 +29,7 @@ public StoreWriteSettings()
         /// <param name="disableMetricsCollection"> If true, disable data store metrics collection. Default is false. Type: boolean (or Expression with resultType boolean). </param>
         /// <param name="copyBehavior"> The type of copy behavior for copy sink. </param>
         /// <param name="additionalProperties"> Additional Properties. </param>
-        internal StoreWriteSettings(string storeWriteSettingsType, DataFactoryElement<int> maxConcurrentConnections, DataFactoryElement<bool> disableMetricsCollection, BinaryData copyBehavior, IDictionary<string, BinaryData> additionalProperties)
+        internal StoreWriteSettings(string storeWriteSettingsType, DataFactoryElement<int> maxConcurrentConnections, DataFactoryElement<bool> disableMetricsCollection, BinaryData copyBehavior, IDictionary<string, DataFactoryElement<string>> additionalProperties)
         {
             StoreWriteSettingsType = storeWriteSettingsType;
             MaxConcurrentConnections = maxConcurrentConnections;
@@ -105,6 +105,6 @@ internal StoreWriteSettings(string storeWriteSettingsType, DataFactoryElement<in
         /// </list>
         /// </para>
         /// </summary>
-        public IDictionary<string, BinaryData> AdditionalProperties { get; }
+        public IDictionary<string, DataFactoryElement<string>> AdditionalProperties { get; }
     }
 }
diff --git a/src/AzureDataFactory.TestingFramework/Generated/Models/SwitchActivity.Serialization.cs b/src/AzureDataFactory.TestingFramework/Generated/Models/SwitchActivity.Serialization.cs
index c88d1010..b0307da9 100644
--- a/src/AzureDataFactory.TestingFramework/Generated/Models/SwitchActivity.Serialization.cs
+++ b/src/AzureDataFactory.TestingFramework/Generated/Models/SwitchActivity.Serialization.cs
@@ -7,6 +7,7 @@
 
 using System.Text.Json;
 using Azure.Core;
+using Azure.Core.Expressions.DataFactory;
 
 namespace AzureDataFactory.TestingFramework.Models
 {
@@ -107,8 +108,8 @@ internal static SwitchActivity DeserializeSwitchActivity(JsonElement element)
             DataFactoryExpression @on = default;
             Optional<IList<SwitchCaseActivity>> cases = default;
             Optional<IList<PipelineActivity>> defaultActivities = default;
-            IDictionary<string, BinaryData> additionalProperties = default;
-            Dictionary<string, BinaryData> additionalPropertiesDictionary = new Dictionary<string, BinaryData>();
+            IDictionary<string, DataFactoryElement<string>> additionalProperties = default;
+            Dictionary<string, DataFactoryElement<string>> additionalPropertiesDictionary = new Dictionary<string, DataFactoryElement<string>>();
             foreach (var property in element.EnumerateObject())
             {
                 if (property.NameEquals("name"u8))
@@ -217,7 +218,7 @@ internal static SwitchActivity DeserializeSwitchActivity(JsonElement element)
                     }
                     continue;
                 }
-                additionalPropertiesDictionary.Add(property.Name, BinaryData.FromString(property.Value.GetRawText()));
+                additionalPropertiesDictionary.Add(property.Name, JsonSerializer.Deserialize<DataFactoryElement<string>>(property.Value.GetRawText()));
             }
             additionalProperties = additionalPropertiesDictionary;
             return new SwitchActivity(name, type, description.Value, Optional.ToNullable(state), Optional.ToNullable(onInactiveMarkAs), Optional.ToList(dependsOn), Optional.ToList(userProperties), additionalProperties, @on, Optional.ToList(cases), Optional.ToList(defaultActivities));
diff --git a/src/AzureDataFactory.TestingFramework/Generated/Models/SwitchActivity.cs b/src/AzureDataFactory.TestingFramework/Generated/Models/SwitchActivity.cs
index 5d151fab..4f41cba8 100644
--- a/src/AzureDataFactory.TestingFramework/Generated/Models/SwitchActivity.cs
+++ b/src/AzureDataFactory.TestingFramework/Generated/Models/SwitchActivity.cs
@@ -6,6 +6,7 @@
 #nullable disable
 
 using Azure.Core;
+using Azure.Core.Expressions.DataFactory;
 
 namespace AzureDataFactory.TestingFramework.Models
 {
@@ -43,7 +44,7 @@ public SwitchActivity(string name, DataFactoryExpression @on) : base(name)
         /// Please note <see cref="PipelineActivity"/> is the base class. According to the scenario, a derived class of the base class might need to be assigned here, or this property needs to be casted to one of the possible derived classes.
         /// The available derived classes include <see cref="AppendVariableActivity"/>, <see cref="AzureDataExplorerCommandActivity"/>, <see cref="AzureFunctionActivity"/>, <see cref="AzureMLBatchExecutionActivity"/>, <see cref="AzureMLExecutePipelineActivity"/>, <see cref="AzureMLUpdateResourceActivity"/>, <see cref="ControlActivity"/>, <see cref="CopyActivity"/>, <see cref="CustomActivity"/>, <see cref="DataLakeAnalyticsUsqlActivity"/>, <see cref="DatabricksNotebookActivity"/>, <see cref="DatabricksSparkJarActivity"/>, <see cref="DatabricksSparkPythonActivity"/>, <see cref="DeleteActivity"/>, <see cref="ExecuteDataFlowActivity"/>, <see cref="ExecutePipelineActivity"/>, <see cref="ExecuteSsisPackageActivity"/>, <see cref="ExecuteWranglingDataflowActivity"/>, <see cref="ExecutionActivity"/>, <see cref="FailActivity"/>, <see cref="FilterActivity"/>, <see cref="ForEachActivity"/>, <see cref="GetDatasetMetadataActivity"/>, <see cref="HDInsightHiveActivity"/>, <see cref="HDInsightMapReduceActivity"/>, <see cref="HDInsightPigActivity"/>, <see cref="HDInsightSparkActivity"/>, <see cref="HDInsightStreamingActivity"/>, <see cref="IfConditionActivity"/>, <see cref="LookupActivity"/>, <see cref="DataFactoryScriptActivity"/>, <see cref="SetVariableActivity"/>, <see cref="SynapseSparkJobDefinitionActivity"/>, <see cref="SqlServerStoredProcedureActivity"/>, <see cref="SwitchActivity"/>, <see cref="SynapseNotebookActivity"/>, <see cref="UntilActivity"/>, <see cref="ValidationActivity"/>, <see cref="WaitActivity"/>, <see cref="WebActivity"/> and <see cref="WebHookActivity"/>.
         /// </param>
-        internal SwitchActivity(string name, string activityType, string description, PipelineActivityState? state, ActivityOnInactiveMarkAs? onInactiveMarkAs, IList<PipelineActivityDependency> dependsOn, IList<PipelineActivityUserProperty> userProperties, IDictionary<string, BinaryData> additionalProperties, DataFactoryExpression @on, IList<SwitchCaseActivity> cases, IList<PipelineActivity> defaultActivities) : base(name, activityType, description, state, onInactiveMarkAs, dependsOn, userProperties, additionalProperties)
+        internal SwitchActivity(string name, string activityType, string description, PipelineActivityState? state, ActivityOnInactiveMarkAs? onInactiveMarkAs, IList<PipelineActivityDependency> dependsOn, IList<PipelineActivityUserProperty> userProperties, IDictionary<string, DataFactoryElement<string>> additionalProperties, DataFactoryExpression @on, IList<SwitchCaseActivity> cases, IList<PipelineActivity> defaultActivities) : base(name, activityType, description, state, onInactiveMarkAs, dependsOn, userProperties, additionalProperties)
         {
             On = @on;
             Cases = cases;
diff --git a/src/AzureDataFactory.TestingFramework/Generated/Models/SybaseLinkedService.Serialization.cs b/src/AzureDataFactory.TestingFramework/Generated/Models/SybaseLinkedService.Serialization.cs
index df57e67c..ad131d53 100644
--- a/src/AzureDataFactory.TestingFramework/Generated/Models/SybaseLinkedService.Serialization.cs
+++ b/src/AzureDataFactory.TestingFramework/Generated/Models/SybaseLinkedService.Serialization.cs
@@ -120,8 +120,8 @@ internal static SybaseLinkedService DeserializeSybaseLinkedService(JsonElement e
             Optional<DataFactoryElement<string>> username = default;
             Optional<DataFactorySecretBaseDefinition> password = default;
             Optional<string> encryptedCredential = default;
-            IDictionary<string, BinaryData> additionalProperties = default;
-            Dictionary<string, BinaryData> additionalPropertiesDictionary = new Dictionary<string, BinaryData>();
+            IDictionary<string, DataFactoryElement<string>> additionalProperties = default;
+            Dictionary<string, DataFactoryElement<string>> additionalPropertiesDictionary = new Dictionary<string, DataFactoryElement<string>>();
             foreach (var property in element.EnumerateObject())
             {
                 if (property.NameEquals("type"u8))
@@ -241,7 +241,7 @@ internal static SybaseLinkedService DeserializeSybaseLinkedService(JsonElement e
                     }
                     continue;
                 }
-                additionalPropertiesDictionary.Add(property.Name, BinaryData.FromString(property.Value.GetRawText()));
+                additionalPropertiesDictionary.Add(property.Name, JsonSerializer.Deserialize<DataFactoryElement<string>>(property.Value.GetRawText()));
             }
             additionalProperties = additionalPropertiesDictionary;
             return new SybaseLinkedService(type, connectVia.Value, description.Value, Optional.ToDictionary(parameters), Optional.ToList(annotations), additionalProperties, server, database, schema.Value, Optional.ToNullable(authenticationType), username.Value, password, encryptedCredential.Value);
diff --git a/src/AzureDataFactory.TestingFramework/Generated/Models/SybaseLinkedService.cs b/src/AzureDataFactory.TestingFramework/Generated/Models/SybaseLinkedService.cs
index 5bc8aaa5..d0b54fff 100644
--- a/src/AzureDataFactory.TestingFramework/Generated/Models/SybaseLinkedService.cs
+++ b/src/AzureDataFactory.TestingFramework/Generated/Models/SybaseLinkedService.cs
@@ -41,7 +41,7 @@ public SybaseLinkedService(DataFactoryElement<string> server, DataFactoryElement
         /// <param name="username"> Username for authentication. Type: string (or Expression with resultType string). </param>
         /// <param name="password"> Password for authentication. </param>
         /// <param name="encryptedCredential"> The encrypted credential used for authentication. Credentials are encrypted using the integration runtime credential manager. Type: string. </param>
-        internal SybaseLinkedService(string linkedServiceType, IntegrationRuntimeReference connectVia, string description, IDictionary<string, EntityParameterSpecification> parameters, IList<BinaryData> annotations, IDictionary<string, BinaryData> additionalProperties, DataFactoryElement<string> server, DataFactoryElement<string> database, DataFactoryElement<string> schema, SybaseAuthenticationType? authenticationType, DataFactoryElement<string> username, DataFactorySecretBaseDefinition password, string encryptedCredential) : base(linkedServiceType, connectVia, description, parameters, annotations, additionalProperties)
+        internal SybaseLinkedService(string linkedServiceType, IntegrationRuntimeReference connectVia, string description, IDictionary<string, EntityParameterSpecification> parameters, IList<BinaryData> annotations, IDictionary<string, DataFactoryElement<string>> additionalProperties, DataFactoryElement<string> server, DataFactoryElement<string> database, DataFactoryElement<string> schema, SybaseAuthenticationType? authenticationType, DataFactoryElement<string> username, DataFactorySecretBaseDefinition password, string encryptedCredential) : base(linkedServiceType, connectVia, description, parameters, annotations, additionalProperties)
         {
             Server = server;
             Database = database;
diff --git a/src/AzureDataFactory.TestingFramework/Generated/Models/SybaseSource.Serialization.cs b/src/AzureDataFactory.TestingFramework/Generated/Models/SybaseSource.Serialization.cs
index 892b8feb..c12a950a 100644
--- a/src/AzureDataFactory.TestingFramework/Generated/Models/SybaseSource.Serialization.cs
+++ b/src/AzureDataFactory.TestingFramework/Generated/Models/SybaseSource.Serialization.cs
@@ -83,8 +83,8 @@ internal static SybaseSource DeserializeSybaseSource(JsonElement element)
             Optional<DataFactoryElement<string>> sourceRetryWait = default;
             Optional<DataFactoryElement<int>> maxConcurrentConnections = default;
             Optional<DataFactoryElement<bool>> disableMetricsCollection = default;
-            IDictionary<string, BinaryData> additionalProperties = default;
-            Dictionary<string, BinaryData> additionalPropertiesDictionary = new Dictionary<string, BinaryData>();
+            IDictionary<string, DataFactoryElement<string>> additionalProperties = default;
+            Dictionary<string, DataFactoryElement<string>> additionalPropertiesDictionary = new Dictionary<string, DataFactoryElement<string>>();
             foreach (var property in element.EnumerateObject())
             {
                 if (property.NameEquals("query"u8))
@@ -155,7 +155,7 @@ internal static SybaseSource DeserializeSybaseSource(JsonElement element)
                     disableMetricsCollection = JsonSerializer.Deserialize<DataFactoryElement<bool>>(property.Value.GetRawText());
                     continue;
                 }
-                additionalPropertiesDictionary.Add(property.Name, BinaryData.FromString(property.Value.GetRawText()));
+                additionalPropertiesDictionary.Add(property.Name, JsonSerializer.Deserialize<DataFactoryElement<string>>(property.Value.GetRawText()));
             }
             additionalProperties = additionalPropertiesDictionary;
             return new SybaseSource(type, sourceRetryCount.Value, sourceRetryWait.Value, maxConcurrentConnections.Value, disableMetricsCollection.Value, additionalProperties, queryTimeout.Value, additionalColumns.Value, query.Value);
diff --git a/src/AzureDataFactory.TestingFramework/Generated/Models/SybaseSource.cs b/src/AzureDataFactory.TestingFramework/Generated/Models/SybaseSource.cs
index 7bf30fb3..f0250121 100644
--- a/src/AzureDataFactory.TestingFramework/Generated/Models/SybaseSource.cs
+++ b/src/AzureDataFactory.TestingFramework/Generated/Models/SybaseSource.cs
@@ -28,7 +28,7 @@ public SybaseSource()
         /// <param name="queryTimeout"> Query timeout. Type: string (or Expression with resultType string), pattern: ((\d+)\.)?(\d\d):(60|([0-5][0-9])):(60|([0-5][0-9])). </param>
         /// <param name="additionalColumns"> Specifies the additional columns to be added to source data. Type: array of objects(AdditionalColumns) (or Expression with resultType array of objects). </param>
         /// <param name="query"> Database query. Type: string (or Expression with resultType string). </param>
-        internal SybaseSource(string copySourceType, DataFactoryElement<int> sourceRetryCount, DataFactoryElement<string> sourceRetryWait, DataFactoryElement<int> maxConcurrentConnections, DataFactoryElement<bool> disableMetricsCollection, IDictionary<string, BinaryData> additionalProperties, DataFactoryElement<string> queryTimeout, BinaryData additionalColumns, DataFactoryElement<string> query) : base(copySourceType, sourceRetryCount, sourceRetryWait, maxConcurrentConnections, disableMetricsCollection, additionalProperties, queryTimeout, additionalColumns)
+        internal SybaseSource(string copySourceType, DataFactoryElement<int> sourceRetryCount, DataFactoryElement<string> sourceRetryWait, DataFactoryElement<int> maxConcurrentConnections, DataFactoryElement<bool> disableMetricsCollection, IDictionary<string, DataFactoryElement<string>> additionalProperties, DataFactoryElement<string> queryTimeout, BinaryData additionalColumns, DataFactoryElement<string> query) : base(copySourceType, sourceRetryCount, sourceRetryWait, maxConcurrentConnections, disableMetricsCollection, additionalProperties, queryTimeout, additionalColumns)
         {
             Query = query;
             CopySourceType = copySourceType ?? "SybaseSource";
diff --git a/src/AzureDataFactory.TestingFramework/Generated/Models/SybaseTableDataset.Serialization.cs b/src/AzureDataFactory.TestingFramework/Generated/Models/SybaseTableDataset.Serialization.cs
index 19e1cc30..558243a7 100644
--- a/src/AzureDataFactory.TestingFramework/Generated/Models/SybaseTableDataset.Serialization.cs
+++ b/src/AzureDataFactory.TestingFramework/Generated/Models/SybaseTableDataset.Serialization.cs
@@ -104,8 +104,8 @@ internal static SybaseTableDataset DeserializeSybaseTableDataset(JsonElement ele
             Optional<IList<BinaryData>> annotations = default;
             Optional<DatasetFolder> folder = default;
             Optional<DataFactoryElement<string>> tableName = default;
-            IDictionary<string, BinaryData> additionalProperties = default;
-            Dictionary<string, BinaryData> additionalPropertiesDictionary = new Dictionary<string, BinaryData>();
+            IDictionary<string, DataFactoryElement<string>> additionalProperties = default;
+            Dictionary<string, DataFactoryElement<string>> additionalPropertiesDictionary = new Dictionary<string, DataFactoryElement<string>>();
             foreach (var property in element.EnumerateObject())
             {
                 if (property.NameEquals("type"u8))
@@ -206,7 +206,7 @@ internal static SybaseTableDataset DeserializeSybaseTableDataset(JsonElement ele
                     }
                     continue;
                 }
-                additionalPropertiesDictionary.Add(property.Name, BinaryData.FromString(property.Value.GetRawText()));
+                additionalPropertiesDictionary.Add(property.Name, JsonSerializer.Deserialize<DataFactoryElement<string>>(property.Value.GetRawText()));
             }
             additionalProperties = additionalPropertiesDictionary;
             return new SybaseTableDataset(type, description.Value, structure.Value, schema.Value, linkedServiceName, Optional.ToDictionary(parameters), Optional.ToList(annotations), folder.Value, additionalProperties, tableName.Value);
diff --git a/src/AzureDataFactory.TestingFramework/Generated/Models/SybaseTableDataset.cs b/src/AzureDataFactory.TestingFramework/Generated/Models/SybaseTableDataset.cs
index 171cb210..a0f8240d 100644
--- a/src/AzureDataFactory.TestingFramework/Generated/Models/SybaseTableDataset.cs
+++ b/src/AzureDataFactory.TestingFramework/Generated/Models/SybaseTableDataset.cs
@@ -34,7 +34,7 @@ public SybaseTableDataset(DataFactoryLinkedServiceReference linkedServiceName) :
         /// <param name="folder"> The folder that this Dataset is in. If not specified, Dataset will appear at the root level. </param>
         /// <param name="additionalProperties"> Additional Properties. </param>
         /// <param name="tableName"> The Sybase table name. Type: string (or Expression with resultType string). </param>
-        internal SybaseTableDataset(string datasetType, string description, DataFactoryElement<IList<DatasetDataElement>> structure, DataFactoryElement<IList<DatasetSchemaDataElement>> schema, DataFactoryLinkedServiceReference linkedServiceName, IDictionary<string, EntityParameterSpecification> parameters, IList<BinaryData> annotations, DatasetFolder folder, IDictionary<string, BinaryData> additionalProperties, DataFactoryElement<string> tableName) : base(datasetType, description, structure, schema, linkedServiceName, parameters, annotations, folder, additionalProperties)
+        internal SybaseTableDataset(string datasetType, string description, DataFactoryElement<IList<DatasetDataElement>> structure, DataFactoryElement<IList<DatasetSchemaDataElement>> schema, DataFactoryLinkedServiceReference linkedServiceName, IDictionary<string, EntityParameterSpecification> parameters, IList<BinaryData> annotations, DatasetFolder folder, IDictionary<string, DataFactoryElement<string>> additionalProperties, DataFactoryElement<string> tableName) : base(datasetType, description, structure, schema, linkedServiceName, parameters, annotations, folder, additionalProperties)
         {
             TableName = tableName;
             DatasetType = datasetType ?? "SybaseTable";
diff --git a/src/AzureDataFactory.TestingFramework/Generated/Models/SynapseNotebookActivity.Serialization.cs b/src/AzureDataFactory.TestingFramework/Generated/Models/SynapseNotebookActivity.Serialization.cs
index bcaf9164..717df432 100644
--- a/src/AzureDataFactory.TestingFramework/Generated/Models/SynapseNotebookActivity.Serialization.cs
+++ b/src/AzureDataFactory.TestingFramework/Generated/Models/SynapseNotebookActivity.Serialization.cs
@@ -176,9 +176,9 @@ internal static SynapseNotebookActivity DeserializeSynapseNotebookActivity(JsonE
             Optional<DataFactoryElement<int>> numExecutors = default;
             Optional<DataFactorySparkConfigurationType> configurationType = default;
             Optional<SparkConfigurationParametrizationReference> targetSparkConfiguration = default;
-            Optional<IDictionary<string, BinaryData>> sparkConfig = default;
-            IDictionary<string, BinaryData> additionalProperties = default;
-            Dictionary<string, BinaryData> additionalPropertiesDictionary = new Dictionary<string, BinaryData>();
+            Optional<IDictionary<string, DataFactoryElement<string>>> sparkConfig = default;
+            IDictionary<string, DataFactoryElement<string>> additionalProperties = default;
+            Dictionary<string, DataFactoryElement<string>> additionalPropertiesDictionary = new Dictionary<string, DataFactoryElement<string>>();
             foreach (var property in element.EnumerateObject())
             {
                 if (property.NameEquals("linkedServiceName"u8))
@@ -357,7 +357,7 @@ internal static SynapseNotebookActivity DeserializeSynapseNotebookActivity(JsonE
                             {
                                 continue;
                             }
-                            Dictionary<string, BinaryData> dictionary = new Dictionary<string, BinaryData>();
+                            Dictionary<string, DataFactoryElement<string>> dictionary = new Dictionary<string, DataFactoryElement<string>>();
                             foreach (var property1 in property0.Value.EnumerateObject())
                             {
                                 if (property1.Value.ValueKind == JsonValueKind.Null)
@@ -366,7 +366,7 @@ internal static SynapseNotebookActivity DeserializeSynapseNotebookActivity(JsonE
                                 }
                                 else
                                 {
-                                    dictionary.Add(property1.Name, BinaryData.FromString(property1.Value.GetRawText()));
+                                    dictionary.Add(property1.Name, JsonSerializer.Deserialize<DataFactoryElement<string>>(property1.Value.GetRawText()));
                                 }
                             }
                             sparkConfig = dictionary;
@@ -375,7 +375,7 @@ internal static SynapseNotebookActivity DeserializeSynapseNotebookActivity(JsonE
                     }
                     continue;
                 }
-                additionalPropertiesDictionary.Add(property.Name, BinaryData.FromString(property.Value.GetRawText()));
+                additionalPropertiesDictionary.Add(property.Name, JsonSerializer.Deserialize<DataFactoryElement<string>>(property.Value.GetRawText()));
             }
             additionalProperties = additionalPropertiesDictionary;
             return new SynapseNotebookActivity(name, type, description.Value, Optional.ToNullable(state), Optional.ToNullable(onInactiveMarkAs), Optional.ToList(dependsOn), Optional.ToList(userProperties), additionalProperties, linkedServiceName, policy.Value, notebook, sparkPool.Value, Optional.ToDictionary(parameters), executorSize.Value, conf.Value, driverSize.Value, numExecutors.Value, Optional.ToNullable(configurationType), targetSparkConfiguration.Value, Optional.ToDictionary(sparkConfig));
diff --git a/src/AzureDataFactory.TestingFramework/Generated/Models/SynapseNotebookActivity.cs b/src/AzureDataFactory.TestingFramework/Generated/Models/SynapseNotebookActivity.cs
index 0808c1f4..3895e06d 100644
--- a/src/AzureDataFactory.TestingFramework/Generated/Models/SynapseNotebookActivity.cs
+++ b/src/AzureDataFactory.TestingFramework/Generated/Models/SynapseNotebookActivity.cs
@@ -24,7 +24,7 @@ public SynapseNotebookActivity(string name, SynapseNotebookReference notebook) :
 
             Notebook = notebook;
             Parameters = new ChangeTrackingDictionary<string, NotebookParameter>();
-            SparkConfig = new ChangeTrackingDictionary<string, BinaryData>();
+            SparkConfig = new ChangeTrackingDictionary<string, DataFactoryElement<string>>();
             ActivityType = "SynapseNotebook";
         }
 
@@ -49,7 +49,7 @@ public SynapseNotebookActivity(string name, SynapseNotebookReference notebook) :
         /// <param name="configurationType"> The type of the spark config. </param>
         /// <param name="targetSparkConfiguration"> The spark configuration of the spark job. </param>
         /// <param name="sparkConfig"> Spark configuration property. </param>
-        internal SynapseNotebookActivity(string name, string activityType, string description, PipelineActivityState? state, ActivityOnInactiveMarkAs? onInactiveMarkAs, IList<PipelineActivityDependency> dependsOn, IList<PipelineActivityUserProperty> userProperties, IDictionary<string, BinaryData> additionalProperties, DataFactoryLinkedServiceReference linkedServiceName, PipelineActivityPolicy policy, SynapseNotebookReference notebook, BigDataPoolParametrizationReference sparkPool, IDictionary<string, NotebookParameter> parameters, DataFactoryElement<string> executorSize, BinaryData conf, DataFactoryElement<string> driverSize, DataFactoryElement<int> numExecutors, DataFactorySparkConfigurationType? configurationType, SparkConfigurationParametrizationReference targetSparkConfiguration, IDictionary<string, BinaryData> sparkConfig) : base(name, activityType, description, state, onInactiveMarkAs, dependsOn, userProperties, additionalProperties, linkedServiceName, policy)
+        internal SynapseNotebookActivity(string name, string activityType, string description, PipelineActivityState? state, ActivityOnInactiveMarkAs? onInactiveMarkAs, IList<PipelineActivityDependency> dependsOn, IList<PipelineActivityUserProperty> userProperties, IDictionary<string, DataFactoryElement<string>> additionalProperties, DataFactoryLinkedServiceReference linkedServiceName, PipelineActivityPolicy policy, SynapseNotebookReference notebook, BigDataPoolParametrizationReference sparkPool, IDictionary<string, NotebookParameter> parameters, DataFactoryElement<string> executorSize, BinaryData conf, DataFactoryElement<string> driverSize, DataFactoryElement<int> numExecutors, DataFactorySparkConfigurationType? configurationType, SparkConfigurationParametrizationReference targetSparkConfiguration, IDictionary<string, DataFactoryElement<string>> sparkConfig) : base(name, activityType, description, state, onInactiveMarkAs, dependsOn, userProperties, additionalProperties, linkedServiceName, policy)
         {
             Notebook = notebook;
             SparkPool = sparkPool;
@@ -141,6 +141,6 @@ internal SynapseNotebookActivity(string name, string activityType, string descri
         /// </list>
         /// </para>
         /// </summary>
-        public IDictionary<string, BinaryData> SparkConfig { get; }
+        public IDictionary<string, DataFactoryElement<string>> SparkConfig { get; }
     }
 }
diff --git a/src/AzureDataFactory.TestingFramework/Generated/Models/SynapseSparkJobDefinitionActivity.Serialization.cs b/src/AzureDataFactory.TestingFramework/Generated/Models/SynapseSparkJobDefinitionActivity.Serialization.cs
index 8fe56ca5..e170c1bf 100644
--- a/src/AzureDataFactory.TestingFramework/Generated/Models/SynapseSparkJobDefinitionActivity.Serialization.cs
+++ b/src/AzureDataFactory.TestingFramework/Generated/Models/SynapseSparkJobDefinitionActivity.Serialization.cs
@@ -262,9 +262,9 @@ internal static SynapseSparkJobDefinitionActivity DeserializeSynapseSparkJobDefi
             Optional<DataFactoryElement<int>> numExecutors = default;
             Optional<DataFactorySparkConfigurationType> configurationType = default;
             Optional<SparkConfigurationParametrizationReference> targetSparkConfiguration = default;
-            Optional<IDictionary<string, BinaryData>> sparkConfig = default;
-            IDictionary<string, BinaryData> additionalProperties = default;
-            Dictionary<string, BinaryData> additionalPropertiesDictionary = new Dictionary<string, BinaryData>();
+            Optional<IDictionary<string, DataFactoryElement<string>>> sparkConfig = default;
+            IDictionary<string, DataFactoryElement<string>> additionalProperties = default;
+            Dictionary<string, DataFactoryElement<string>> additionalPropertiesDictionary = new Dictionary<string, DataFactoryElement<string>>();
             foreach (var property in element.EnumerateObject())
             {
                 if (property.NameEquals("linkedServiceName"u8))
@@ -540,7 +540,7 @@ internal static SynapseSparkJobDefinitionActivity DeserializeSynapseSparkJobDefi
                             {
                                 continue;
                             }
-                            Dictionary<string, BinaryData> dictionary = new Dictionary<string, BinaryData>();
+                            Dictionary<string, DataFactoryElement<string>> dictionary = new Dictionary<string, DataFactoryElement<string>>();
                             foreach (var property1 in property0.Value.EnumerateObject())
                             {
                                 if (property1.Value.ValueKind == JsonValueKind.Null)
@@ -549,7 +549,7 @@ internal static SynapseSparkJobDefinitionActivity DeserializeSynapseSparkJobDefi
                                 }
                                 else
                                 {
-                                    dictionary.Add(property1.Name, BinaryData.FromString(property1.Value.GetRawText()));
+                                    dictionary.Add(property1.Name, JsonSerializer.Deserialize<DataFactoryElement<string>>(property1.Value.GetRawText()));
                                 }
                             }
                             sparkConfig = dictionary;
@@ -558,7 +558,7 @@ internal static SynapseSparkJobDefinitionActivity DeserializeSynapseSparkJobDefi
                     }
                     continue;
                 }
-                additionalPropertiesDictionary.Add(property.Name, BinaryData.FromString(property.Value.GetRawText()));
+                additionalPropertiesDictionary.Add(property.Name, JsonSerializer.Deserialize<DataFactoryElement<string>>(property.Value.GetRawText()));
             }
             additionalProperties = additionalPropertiesDictionary;
             return new SynapseSparkJobDefinitionActivity(name, type, description.Value, Optional.ToNullable(state), Optional.ToNullable(onInactiveMarkAs), Optional.ToList(dependsOn), Optional.ToList(userProperties), additionalProperties, linkedServiceName, policy.Value, sparkJob, Optional.ToList(args), file.Value, scanFolder.Value, className.Value, Optional.ToList(files), Optional.ToList(pythonCodeReference), Optional.ToList(filesV2), targetBigDataPool.Value, executorSize.Value, conf.Value, driverSize.Value, numExecutors.Value, Optional.ToNullable(configurationType), targetSparkConfiguration.Value, Optional.ToDictionary(sparkConfig));
diff --git a/src/AzureDataFactory.TestingFramework/Generated/Models/SynapseSparkJobDefinitionActivity.cs b/src/AzureDataFactory.TestingFramework/Generated/Models/SynapseSparkJobDefinitionActivity.cs
index 21463e20..8ea0ad6d 100644
--- a/src/AzureDataFactory.TestingFramework/Generated/Models/SynapseSparkJobDefinitionActivity.cs
+++ b/src/AzureDataFactory.TestingFramework/Generated/Models/SynapseSparkJobDefinitionActivity.cs
@@ -27,7 +27,7 @@ public SynapseSparkJobDefinitionActivity(string name, SynapseSparkJobReference s
             Files = new ChangeTrackingList<BinaryData>();
             PythonCodeReference = new ChangeTrackingList<BinaryData>();
             FilesV2 = new ChangeTrackingList<BinaryData>();
-            SparkConfig = new ChangeTrackingDictionary<string, BinaryData>();
+            SparkConfig = new ChangeTrackingDictionary<string, DataFactoryElement<string>>();
             ActivityType = "SparkJob";
         }
 
@@ -58,7 +58,7 @@ public SynapseSparkJobDefinitionActivity(string name, SynapseSparkJobReference s
         /// <param name="configurationType"> The type of the spark config. </param>
         /// <param name="targetSparkConfiguration"> The spark configuration of the spark job. </param>
         /// <param name="sparkConfig"> Spark configuration property. </param>
-        internal SynapseSparkJobDefinitionActivity(string name, string activityType, string description, PipelineActivityState? state, ActivityOnInactiveMarkAs? onInactiveMarkAs, IList<PipelineActivityDependency> dependsOn, IList<PipelineActivityUserProperty> userProperties, IDictionary<string, BinaryData> additionalProperties, DataFactoryLinkedServiceReference linkedServiceName, PipelineActivityPolicy policy, SynapseSparkJobReference sparkJob, IList<BinaryData> arguments, DataFactoryElement<string> file, DataFactoryElement<bool> scanFolder, DataFactoryElement<string> className, IList<BinaryData> files, IList<BinaryData> pythonCodeReference, IList<BinaryData> filesV2, BigDataPoolParametrizationReference targetBigDataPool, DataFactoryElement<string> executorSize, BinaryData conf, DataFactoryElement<string> driverSize, DataFactoryElement<int> numExecutors, DataFactorySparkConfigurationType? configurationType, SparkConfigurationParametrizationReference targetSparkConfiguration, IDictionary<string, BinaryData> sparkConfig) : base(name, activityType, description, state, onInactiveMarkAs, dependsOn, userProperties, additionalProperties, linkedServiceName, policy)
+        internal SynapseSparkJobDefinitionActivity(string name, string activityType, string description, PipelineActivityState? state, ActivityOnInactiveMarkAs? onInactiveMarkAs, IList<PipelineActivityDependency> dependsOn, IList<PipelineActivityUserProperty> userProperties, IDictionary<string, DataFactoryElement<string>> additionalProperties, DataFactoryLinkedServiceReference linkedServiceName, PipelineActivityPolicy policy, SynapseSparkJobReference sparkJob, IList<BinaryData> arguments, DataFactoryElement<string> file, DataFactoryElement<bool> scanFolder, DataFactoryElement<string> className, IList<BinaryData> files, IList<BinaryData> pythonCodeReference, IList<BinaryData> filesV2, BigDataPoolParametrizationReference targetBigDataPool, DataFactoryElement<string> executorSize, BinaryData conf, DataFactoryElement<string> driverSize, DataFactoryElement<int> numExecutors, DataFactorySparkConfigurationType? configurationType, SparkConfigurationParametrizationReference targetSparkConfiguration, IDictionary<string, DataFactoryElement<string>> sparkConfig) : base(name, activityType, description, state, onInactiveMarkAs, dependsOn, userProperties, additionalProperties, linkedServiceName, policy)
         {
             SparkJob = sparkJob;
             Arguments = arguments;
@@ -284,6 +284,6 @@ internal SynapseSparkJobDefinitionActivity(string name, string activityType, str
         /// </list>
         /// </para>
         /// </summary>
-        public IDictionary<string, BinaryData> SparkConfig { get; }
+        public IDictionary<string, DataFactoryElement<string>> SparkConfig { get; }
     }
 }
diff --git a/src/AzureDataFactory.TestingFramework/Generated/Models/TabularSource.Serialization.cs b/src/AzureDataFactory.TestingFramework/Generated/Models/TabularSource.Serialization.cs
index 23cef347..a860d0bf 100644
--- a/src/AzureDataFactory.TestingFramework/Generated/Models/TabularSource.Serialization.cs
+++ b/src/AzureDataFactory.TestingFramework/Generated/Models/TabularSource.Serialization.cs
@@ -142,8 +142,8 @@ internal static TabularSource DeserializeTabularSource(JsonElement element)
             Optional<DataFactoryElement<string>> sourceRetryWait = default;
             Optional<DataFactoryElement<int>> maxConcurrentConnections = default;
             Optional<DataFactoryElement<bool>> disableMetricsCollection = default;
-            IDictionary<string, BinaryData> additionalProperties = default;
-            Dictionary<string, BinaryData> additionalPropertiesDictionary = new Dictionary<string, BinaryData>();
+            IDictionary<string, DataFactoryElement<string>> additionalProperties = default;
+            Dictionary<string, DataFactoryElement<string>> additionalPropertiesDictionary = new Dictionary<string, DataFactoryElement<string>>();
             foreach (var property in element.EnumerateObject())
             {
                 if (property.NameEquals("queryTimeout"u8))
@@ -205,7 +205,7 @@ internal static TabularSource DeserializeTabularSource(JsonElement element)
                     disableMetricsCollection = JsonSerializer.Deserialize<DataFactoryElement<bool>>(property.Value.GetRawText());
                     continue;
                 }
-                additionalPropertiesDictionary.Add(property.Name, BinaryData.FromString(property.Value.GetRawText()));
+                additionalPropertiesDictionary.Add(property.Name, JsonSerializer.Deserialize<DataFactoryElement<string>>(property.Value.GetRawText()));
             }
             additionalProperties = additionalPropertiesDictionary;
             return new TabularSource(type, sourceRetryCount.Value, sourceRetryWait.Value, maxConcurrentConnections.Value, disableMetricsCollection.Value, additionalProperties, queryTimeout.Value, additionalColumns.Value);
diff --git a/src/AzureDataFactory.TestingFramework/Generated/Models/TabularSource.cs b/src/AzureDataFactory.TestingFramework/Generated/Models/TabularSource.cs
index 33831caa..a98a011c 100644
--- a/src/AzureDataFactory.TestingFramework/Generated/Models/TabularSource.cs
+++ b/src/AzureDataFactory.TestingFramework/Generated/Models/TabularSource.cs
@@ -31,7 +31,7 @@ public TabularSource()
         /// <param name="additionalProperties"> Additional Properties. </param>
         /// <param name="queryTimeout"> Query timeout. Type: string (or Expression with resultType string), pattern: ((\d+)\.)?(\d\d):(60|([0-5][0-9])):(60|([0-5][0-9])). </param>
         /// <param name="additionalColumns"> Specifies the additional columns to be added to source data. Type: array of objects(AdditionalColumns) (or Expression with resultType array of objects). </param>
-        internal TabularSource(string copySourceType, DataFactoryElement<int> sourceRetryCount, DataFactoryElement<string> sourceRetryWait, DataFactoryElement<int> maxConcurrentConnections, DataFactoryElement<bool> disableMetricsCollection, IDictionary<string, BinaryData> additionalProperties, DataFactoryElement<string> queryTimeout, BinaryData additionalColumns) : base(copySourceType, sourceRetryCount, sourceRetryWait, maxConcurrentConnections, disableMetricsCollection, additionalProperties)
+        internal TabularSource(string copySourceType, DataFactoryElement<int> sourceRetryCount, DataFactoryElement<string> sourceRetryWait, DataFactoryElement<int> maxConcurrentConnections, DataFactoryElement<bool> disableMetricsCollection, IDictionary<string, DataFactoryElement<string>> additionalProperties, DataFactoryElement<string> queryTimeout, BinaryData additionalColumns) : base(copySourceType, sourceRetryCount, sourceRetryWait, maxConcurrentConnections, disableMetricsCollection, additionalProperties)
         {
             QueryTimeout = queryTimeout;
             AdditionalColumns = additionalColumns;
diff --git a/src/AzureDataFactory.TestingFramework/Generated/Models/TarGzipReadSettings.Serialization.cs b/src/AzureDataFactory.TestingFramework/Generated/Models/TarGzipReadSettings.Serialization.cs
index 5bd18977..d0fac7e0 100644
--- a/src/AzureDataFactory.TestingFramework/Generated/Models/TarGzipReadSettings.Serialization.cs
+++ b/src/AzureDataFactory.TestingFramework/Generated/Models/TarGzipReadSettings.Serialization.cs
@@ -43,8 +43,8 @@ internal static TarGzipReadSettings DeserializeTarGzipReadSettings(JsonElement e
             }
             Optional<DataFactoryElement<bool>> preserveCompressionFileNameAsFolder = default;
             string type = default;
-            IDictionary<string, BinaryData> additionalProperties = default;
-            Dictionary<string, BinaryData> additionalPropertiesDictionary = new Dictionary<string, BinaryData>();
+            IDictionary<string, DataFactoryElement<string>> additionalProperties = default;
+            Dictionary<string, DataFactoryElement<string>> additionalPropertiesDictionary = new Dictionary<string, DataFactoryElement<string>>();
             foreach (var property in element.EnumerateObject())
             {
                 if (property.NameEquals("preserveCompressionFileNameAsFolder"u8))
@@ -61,7 +61,7 @@ internal static TarGzipReadSettings DeserializeTarGzipReadSettings(JsonElement e
                     type = property.Value.GetString();
                     continue;
                 }
-                additionalPropertiesDictionary.Add(property.Name, BinaryData.FromString(property.Value.GetRawText()));
+                additionalPropertiesDictionary.Add(property.Name, JsonSerializer.Deserialize<DataFactoryElement<string>>(property.Value.GetRawText()));
             }
             additionalProperties = additionalPropertiesDictionary;
             return new TarGzipReadSettings(type, additionalProperties, preserveCompressionFileNameAsFolder.Value);
diff --git a/src/AzureDataFactory.TestingFramework/Generated/Models/TarGzipReadSettings.cs b/src/AzureDataFactory.TestingFramework/Generated/Models/TarGzipReadSettings.cs
index 894d5286..fcd7b014 100644
--- a/src/AzureDataFactory.TestingFramework/Generated/Models/TarGzipReadSettings.cs
+++ b/src/AzureDataFactory.TestingFramework/Generated/Models/TarGzipReadSettings.cs
@@ -22,7 +22,7 @@ public TarGzipReadSettings()
         /// <param name="compressionReadSettingsType"> The Compression setting type. </param>
         /// <param name="additionalProperties"> Additional Properties. </param>
         /// <param name="preserveCompressionFileNameAsFolder"> Preserve the compression file name as folder path. Type: boolean (or Expression with resultType boolean). </param>
-        internal TarGzipReadSettings(string compressionReadSettingsType, IDictionary<string, BinaryData> additionalProperties, DataFactoryElement<bool> preserveCompressionFileNameAsFolder) : base(compressionReadSettingsType, additionalProperties)
+        internal TarGzipReadSettings(string compressionReadSettingsType, IDictionary<string, DataFactoryElement<string>> additionalProperties, DataFactoryElement<bool> preserveCompressionFileNameAsFolder) : base(compressionReadSettingsType, additionalProperties)
         {
             PreserveCompressionFileNameAsFolder = preserveCompressionFileNameAsFolder;
             CompressionReadSettingsType = compressionReadSettingsType ?? "TarGZipReadSettings";
diff --git a/src/AzureDataFactory.TestingFramework/Generated/Models/TarReadSettings.Serialization.cs b/src/AzureDataFactory.TestingFramework/Generated/Models/TarReadSettings.Serialization.cs
index 058306af..6b60fb30 100644
--- a/src/AzureDataFactory.TestingFramework/Generated/Models/TarReadSettings.Serialization.cs
+++ b/src/AzureDataFactory.TestingFramework/Generated/Models/TarReadSettings.Serialization.cs
@@ -43,8 +43,8 @@ internal static TarReadSettings DeserializeTarReadSettings(JsonElement element)
             }
             Optional<DataFactoryElement<bool>> preserveCompressionFileNameAsFolder = default;
             string type = default;
-            IDictionary<string, BinaryData> additionalProperties = default;
-            Dictionary<string, BinaryData> additionalPropertiesDictionary = new Dictionary<string, BinaryData>();
+            IDictionary<string, DataFactoryElement<string>> additionalProperties = default;
+            Dictionary<string, DataFactoryElement<string>> additionalPropertiesDictionary = new Dictionary<string, DataFactoryElement<string>>();
             foreach (var property in element.EnumerateObject())
             {
                 if (property.NameEquals("preserveCompressionFileNameAsFolder"u8))
@@ -61,7 +61,7 @@ internal static TarReadSettings DeserializeTarReadSettings(JsonElement element)
                     type = property.Value.GetString();
                     continue;
                 }
-                additionalPropertiesDictionary.Add(property.Name, BinaryData.FromString(property.Value.GetRawText()));
+                additionalPropertiesDictionary.Add(property.Name, JsonSerializer.Deserialize<DataFactoryElement<string>>(property.Value.GetRawText()));
             }
             additionalProperties = additionalPropertiesDictionary;
             return new TarReadSettings(type, additionalProperties, preserveCompressionFileNameAsFolder.Value);
diff --git a/src/AzureDataFactory.TestingFramework/Generated/Models/TarReadSettings.cs b/src/AzureDataFactory.TestingFramework/Generated/Models/TarReadSettings.cs
index 651d7c96..3156e24a 100644
--- a/src/AzureDataFactory.TestingFramework/Generated/Models/TarReadSettings.cs
+++ b/src/AzureDataFactory.TestingFramework/Generated/Models/TarReadSettings.cs
@@ -22,7 +22,7 @@ public TarReadSettings()
         /// <param name="compressionReadSettingsType"> The Compression setting type. </param>
         /// <param name="additionalProperties"> Additional Properties. </param>
         /// <param name="preserveCompressionFileNameAsFolder"> Preserve the compression file name as folder path. Type: boolean (or Expression with resultType boolean). </param>
-        internal TarReadSettings(string compressionReadSettingsType, IDictionary<string, BinaryData> additionalProperties, DataFactoryElement<bool> preserveCompressionFileNameAsFolder) : base(compressionReadSettingsType, additionalProperties)
+        internal TarReadSettings(string compressionReadSettingsType, IDictionary<string, DataFactoryElement<string>> additionalProperties, DataFactoryElement<bool> preserveCompressionFileNameAsFolder) : base(compressionReadSettingsType, additionalProperties)
         {
             PreserveCompressionFileNameAsFolder = preserveCompressionFileNameAsFolder;
             CompressionReadSettingsType = compressionReadSettingsType ?? "TarReadSettings";
diff --git a/src/AzureDataFactory.TestingFramework/Generated/Models/TeamDeskLinkedService.Serialization.cs b/src/AzureDataFactory.TestingFramework/Generated/Models/TeamDeskLinkedService.Serialization.cs
index 96890fbb..71d428a8 100644
--- a/src/AzureDataFactory.TestingFramework/Generated/Models/TeamDeskLinkedService.Serialization.cs
+++ b/src/AzureDataFactory.TestingFramework/Generated/Models/TeamDeskLinkedService.Serialization.cs
@@ -114,8 +114,8 @@ internal static TeamDeskLinkedService DeserializeTeamDeskLinkedService(JsonEleme
             Optional<DataFactorySecretBaseDefinition> password = default;
             Optional<DataFactorySecretBaseDefinition> apiToken = default;
             Optional<string> encryptedCredential = default;
-            IDictionary<string, BinaryData> additionalProperties = default;
-            Dictionary<string, BinaryData> additionalPropertiesDictionary = new Dictionary<string, BinaryData>();
+            IDictionary<string, DataFactoryElement<string>> additionalProperties = default;
+            Dictionary<string, DataFactoryElement<string>> additionalPropertiesDictionary = new Dictionary<string, DataFactoryElement<string>>();
             foreach (var property in element.EnumerateObject())
             {
                 if (property.NameEquals("type"u8))
@@ -226,7 +226,7 @@ internal static TeamDeskLinkedService DeserializeTeamDeskLinkedService(JsonEleme
                     }
                     continue;
                 }
-                additionalPropertiesDictionary.Add(property.Name, BinaryData.FromString(property.Value.GetRawText()));
+                additionalPropertiesDictionary.Add(property.Name, JsonSerializer.Deserialize<DataFactoryElement<string>>(property.Value.GetRawText()));
             }
             additionalProperties = additionalPropertiesDictionary;
             return new TeamDeskLinkedService(type, connectVia.Value, description.Value, Optional.ToDictionary(parameters), Optional.ToList(annotations), additionalProperties, authenticationType, url, userName.Value, password, apiToken, encryptedCredential.Value);
diff --git a/src/AzureDataFactory.TestingFramework/Generated/Models/TeamDeskLinkedService.cs b/src/AzureDataFactory.TestingFramework/Generated/Models/TeamDeskLinkedService.cs
index a235e73c..17722db0 100644
--- a/src/AzureDataFactory.TestingFramework/Generated/Models/TeamDeskLinkedService.cs
+++ b/src/AzureDataFactory.TestingFramework/Generated/Models/TeamDeskLinkedService.cs
@@ -39,7 +39,7 @@ public TeamDeskLinkedService(TeamDeskAuthenticationType authenticationType, Data
         /// <param name="password"> The password of the TeamDesk source. </param>
         /// <param name="apiToken"> The api token for the TeamDesk source. </param>
         /// <param name="encryptedCredential"> The encrypted credential used for authentication. Credentials are encrypted using the integration runtime credential manager. Type: string. </param>
-        internal TeamDeskLinkedService(string linkedServiceType, IntegrationRuntimeReference connectVia, string description, IDictionary<string, EntityParameterSpecification> parameters, IList<BinaryData> annotations, IDictionary<string, BinaryData> additionalProperties, TeamDeskAuthenticationType authenticationType, DataFactoryElement<string> uri, DataFactoryElement<string> userName, DataFactorySecretBaseDefinition password, DataFactorySecretBaseDefinition apiToken, string encryptedCredential) : base(linkedServiceType, connectVia, description, parameters, annotations, additionalProperties)
+        internal TeamDeskLinkedService(string linkedServiceType, IntegrationRuntimeReference connectVia, string description, IDictionary<string, EntityParameterSpecification> parameters, IList<BinaryData> annotations, IDictionary<string, DataFactoryElement<string>> additionalProperties, TeamDeskAuthenticationType authenticationType, DataFactoryElement<string> uri, DataFactoryElement<string> userName, DataFactorySecretBaseDefinition password, DataFactorySecretBaseDefinition apiToken, string encryptedCredential) : base(linkedServiceType, connectVia, description, parameters, annotations, additionalProperties)
         {
             AuthenticationType = authenticationType;
             Uri = uri;
diff --git a/src/AzureDataFactory.TestingFramework/Generated/Models/TeradataLinkedService.Serialization.cs b/src/AzureDataFactory.TestingFramework/Generated/Models/TeradataLinkedService.Serialization.cs
index d320d5a2..484daf03 100644
--- a/src/AzureDataFactory.TestingFramework/Generated/Models/TeradataLinkedService.Serialization.cs
+++ b/src/AzureDataFactory.TestingFramework/Generated/Models/TeradataLinkedService.Serialization.cs
@@ -124,8 +124,8 @@ internal static TeradataLinkedService DeserializeTeradataLinkedService(JsonEleme
             Optional<DataFactoryElement<string>> username = default;
             Optional<DataFactorySecretBaseDefinition> password = default;
             Optional<string> encryptedCredential = default;
-            IDictionary<string, BinaryData> additionalProperties = default;
-            Dictionary<string, BinaryData> additionalPropertiesDictionary = new Dictionary<string, BinaryData>();
+            IDictionary<string, DataFactoryElement<string>> additionalProperties = default;
+            Dictionary<string, DataFactoryElement<string>> additionalPropertiesDictionary = new Dictionary<string, DataFactoryElement<string>>();
             foreach (var property in element.EnumerateObject())
             {
                 if (property.NameEquals("type"u8))
@@ -244,7 +244,7 @@ internal static TeradataLinkedService DeserializeTeradataLinkedService(JsonEleme
                     }
                     continue;
                 }
-                additionalPropertiesDictionary.Add(property.Name, BinaryData.FromString(property.Value.GetRawText()));
+                additionalPropertiesDictionary.Add(property.Name, JsonSerializer.Deserialize<DataFactoryElement<string>>(property.Value.GetRawText()));
             }
             additionalProperties = additionalPropertiesDictionary;
             return new TeradataLinkedService(type, connectVia.Value, description.Value, Optional.ToDictionary(parameters), Optional.ToList(annotations), additionalProperties, connectionString.Value, server.Value, Optional.ToNullable(authenticationType), username.Value, password, encryptedCredential.Value);
diff --git a/src/AzureDataFactory.TestingFramework/Generated/Models/TeradataLinkedService.cs b/src/AzureDataFactory.TestingFramework/Generated/Models/TeradataLinkedService.cs
index 0aa3bad9..d729a86b 100644
--- a/src/AzureDataFactory.TestingFramework/Generated/Models/TeradataLinkedService.cs
+++ b/src/AzureDataFactory.TestingFramework/Generated/Models/TeradataLinkedService.cs
@@ -31,7 +31,7 @@ public TeradataLinkedService()
         /// <param name="username"> Username for authentication. Type: string (or Expression with resultType string). </param>
         /// <param name="password"> Password for authentication. </param>
         /// <param name="encryptedCredential"> The encrypted credential used for authentication. Credentials are encrypted using the integration runtime credential manager. Type: string. </param>
-        internal TeradataLinkedService(string linkedServiceType, IntegrationRuntimeReference connectVia, string description, IDictionary<string, EntityParameterSpecification> parameters, IList<BinaryData> annotations, IDictionary<string, BinaryData> additionalProperties, BinaryData connectionString, DataFactoryElement<string> server, TeradataAuthenticationType? authenticationType, DataFactoryElement<string> username, DataFactorySecretBaseDefinition password, string encryptedCredential) : base(linkedServiceType, connectVia, description, parameters, annotations, additionalProperties)
+        internal TeradataLinkedService(string linkedServiceType, IntegrationRuntimeReference connectVia, string description, IDictionary<string, EntityParameterSpecification> parameters, IList<BinaryData> annotations, IDictionary<string, DataFactoryElement<string>> additionalProperties, BinaryData connectionString, DataFactoryElement<string> server, TeradataAuthenticationType? authenticationType, DataFactoryElement<string> username, DataFactorySecretBaseDefinition password, string encryptedCredential) : base(linkedServiceType, connectVia, description, parameters, annotations, additionalProperties)
         {
             ConnectionString = connectionString;
             Server = server;
diff --git a/src/AzureDataFactory.TestingFramework/Generated/Models/TeradataSource.Serialization.cs b/src/AzureDataFactory.TestingFramework/Generated/Models/TeradataSource.Serialization.cs
index a4832ebf..cd4eb430 100644
--- a/src/AzureDataFactory.TestingFramework/Generated/Models/TeradataSource.Serialization.cs
+++ b/src/AzureDataFactory.TestingFramework/Generated/Models/TeradataSource.Serialization.cs
@@ -99,8 +99,8 @@ internal static TeradataSource DeserializeTeradataSource(JsonElement element)
             Optional<DataFactoryElement<string>> sourceRetryWait = default;
             Optional<DataFactoryElement<int>> maxConcurrentConnections = default;
             Optional<DataFactoryElement<bool>> disableMetricsCollection = default;
-            IDictionary<string, BinaryData> additionalProperties = default;
-            Dictionary<string, BinaryData> additionalPropertiesDictionary = new Dictionary<string, BinaryData>();
+            IDictionary<string, DataFactoryElement<string>> additionalProperties = default;
+            Dictionary<string, DataFactoryElement<string>> additionalPropertiesDictionary = new Dictionary<string, DataFactoryElement<string>>();
             foreach (var property in element.EnumerateObject())
             {
                 if (property.NameEquals("query"u8))
@@ -189,7 +189,7 @@ internal static TeradataSource DeserializeTeradataSource(JsonElement element)
                     disableMetricsCollection = JsonSerializer.Deserialize<DataFactoryElement<bool>>(property.Value.GetRawText());
                     continue;
                 }
-                additionalPropertiesDictionary.Add(property.Name, BinaryData.FromString(property.Value.GetRawText()));
+                additionalPropertiesDictionary.Add(property.Name, JsonSerializer.Deserialize<DataFactoryElement<string>>(property.Value.GetRawText()));
             }
             additionalProperties = additionalPropertiesDictionary;
             return new TeradataSource(type, sourceRetryCount.Value, sourceRetryWait.Value, maxConcurrentConnections.Value, disableMetricsCollection.Value, additionalProperties, queryTimeout.Value, additionalColumns.Value, query.Value, partitionOption.Value, partitionSettings.Value);
diff --git a/src/AzureDataFactory.TestingFramework/Generated/Models/TeradataSource.cs b/src/AzureDataFactory.TestingFramework/Generated/Models/TeradataSource.cs
index 31f372e4..9182ad8b 100644
--- a/src/AzureDataFactory.TestingFramework/Generated/Models/TeradataSource.cs
+++ b/src/AzureDataFactory.TestingFramework/Generated/Models/TeradataSource.cs
@@ -30,7 +30,7 @@ public TeradataSource()
         /// <param name="query"> Teradata query. Type: string (or Expression with resultType string). </param>
         /// <param name="partitionOption"> The partition mechanism that will be used for teradata read in parallel. Possible values include: "None", "Hash", "DynamicRange". </param>
         /// <param name="partitionSettings"> The settings that will be leveraged for teradata source partitioning. </param>
-        internal TeradataSource(string copySourceType, DataFactoryElement<int> sourceRetryCount, DataFactoryElement<string> sourceRetryWait, DataFactoryElement<int> maxConcurrentConnections, DataFactoryElement<bool> disableMetricsCollection, IDictionary<string, BinaryData> additionalProperties, DataFactoryElement<string> queryTimeout, BinaryData additionalColumns, DataFactoryElement<string> query, BinaryData partitionOption, TeradataPartitionSettings partitionSettings) : base(copySourceType, sourceRetryCount, sourceRetryWait, maxConcurrentConnections, disableMetricsCollection, additionalProperties, queryTimeout, additionalColumns)
+        internal TeradataSource(string copySourceType, DataFactoryElement<int> sourceRetryCount, DataFactoryElement<string> sourceRetryWait, DataFactoryElement<int> maxConcurrentConnections, DataFactoryElement<bool> disableMetricsCollection, IDictionary<string, DataFactoryElement<string>> additionalProperties, DataFactoryElement<string> queryTimeout, BinaryData additionalColumns, DataFactoryElement<string> query, BinaryData partitionOption, TeradataPartitionSettings partitionSettings) : base(copySourceType, sourceRetryCount, sourceRetryWait, maxConcurrentConnections, disableMetricsCollection, additionalProperties, queryTimeout, additionalColumns)
         {
             Query = query;
             PartitionOption = partitionOption;
diff --git a/src/AzureDataFactory.TestingFramework/Generated/Models/TeradataTableDataset.Serialization.cs b/src/AzureDataFactory.TestingFramework/Generated/Models/TeradataTableDataset.Serialization.cs
index bb2644a3..9784d71d 100644
--- a/src/AzureDataFactory.TestingFramework/Generated/Models/TeradataTableDataset.Serialization.cs
+++ b/src/AzureDataFactory.TestingFramework/Generated/Models/TeradataTableDataset.Serialization.cs
@@ -110,8 +110,8 @@ internal static TeradataTableDataset DeserializeTeradataTableDataset(JsonElement
             Optional<DatasetFolder> folder = default;
             Optional<DataFactoryElement<string>> database = default;
             Optional<DataFactoryElement<string>> table = default;
-            IDictionary<string, BinaryData> additionalProperties = default;
-            Dictionary<string, BinaryData> additionalPropertiesDictionary = new Dictionary<string, BinaryData>();
+            IDictionary<string, DataFactoryElement<string>> additionalProperties = default;
+            Dictionary<string, DataFactoryElement<string>> additionalPropertiesDictionary = new Dictionary<string, DataFactoryElement<string>>();
             foreach (var property in element.EnumerateObject())
             {
                 if (property.NameEquals("type"u8))
@@ -221,7 +221,7 @@ internal static TeradataTableDataset DeserializeTeradataTableDataset(JsonElement
                     }
                     continue;
                 }
-                additionalPropertiesDictionary.Add(property.Name, BinaryData.FromString(property.Value.GetRawText()));
+                additionalPropertiesDictionary.Add(property.Name, JsonSerializer.Deserialize<DataFactoryElement<string>>(property.Value.GetRawText()));
             }
             additionalProperties = additionalPropertiesDictionary;
             return new TeradataTableDataset(type, description.Value, structure.Value, schema.Value, linkedServiceName, Optional.ToDictionary(parameters), Optional.ToList(annotations), folder.Value, additionalProperties, database.Value, table.Value);
diff --git a/src/AzureDataFactory.TestingFramework/Generated/Models/TeradataTableDataset.cs b/src/AzureDataFactory.TestingFramework/Generated/Models/TeradataTableDataset.cs
index 651bd1e7..db6fdc72 100644
--- a/src/AzureDataFactory.TestingFramework/Generated/Models/TeradataTableDataset.cs
+++ b/src/AzureDataFactory.TestingFramework/Generated/Models/TeradataTableDataset.cs
@@ -35,7 +35,7 @@ public TeradataTableDataset(DataFactoryLinkedServiceReference linkedServiceName)
         /// <param name="additionalProperties"> Additional Properties. </param>
         /// <param name="database"> The database name of Teradata. Type: string (or Expression with resultType string). </param>
         /// <param name="table"> The table name of Teradata. Type: string (or Expression with resultType string). </param>
-        internal TeradataTableDataset(string datasetType, string description, DataFactoryElement<IList<DatasetDataElement>> structure, DataFactoryElement<IList<DatasetSchemaDataElement>> schema, DataFactoryLinkedServiceReference linkedServiceName, IDictionary<string, EntityParameterSpecification> parameters, IList<BinaryData> annotations, DatasetFolder folder, IDictionary<string, BinaryData> additionalProperties, DataFactoryElement<string> database, DataFactoryElement<string> table) : base(datasetType, description, structure, schema, linkedServiceName, parameters, annotations, folder, additionalProperties)
+        internal TeradataTableDataset(string datasetType, string description, DataFactoryElement<IList<DatasetDataElement>> structure, DataFactoryElement<IList<DatasetSchemaDataElement>> schema, DataFactoryLinkedServiceReference linkedServiceName, IDictionary<string, EntityParameterSpecification> parameters, IList<BinaryData> annotations, DatasetFolder folder, IDictionary<string, DataFactoryElement<string>> additionalProperties, DataFactoryElement<string> database, DataFactoryElement<string> table) : base(datasetType, description, structure, schema, linkedServiceName, parameters, annotations, folder, additionalProperties)
         {
             Database = database;
             Table = table;
diff --git a/src/AzureDataFactory.TestingFramework/Generated/Models/TriggerPipelineReference.Serialization.cs b/src/AzureDataFactory.TestingFramework/Generated/Models/TriggerPipelineReference.Serialization.cs
index 443d299b..41f94a2f 100644
--- a/src/AzureDataFactory.TestingFramework/Generated/Models/TriggerPipelineReference.Serialization.cs
+++ b/src/AzureDataFactory.TestingFramework/Generated/Models/TriggerPipelineReference.Serialization.cs
@@ -7,6 +7,7 @@
 
 using System.Text.Json;
 using Azure.Core;
+using Azure.Core.Expressions.DataFactory;
 
 namespace AzureDataFactory.TestingFramework.Models
 {
@@ -50,7 +51,7 @@ internal static TriggerPipelineReference DeserializeTriggerPipelineReference(Jso
                 return null;
             }
             Optional<DataFactoryPipelineReference> pipelineReference = default;
-            Optional<IDictionary<string, BinaryData>> parameters = default;
+            Optional<IDictionary<string, DataFactoryElement<string>>> parameters = default;
             foreach (var property in element.EnumerateObject())
             {
                 if (property.NameEquals("pipelineReference"u8))
@@ -68,7 +69,7 @@ internal static TriggerPipelineReference DeserializeTriggerPipelineReference(Jso
                     {
                         continue;
                     }
-                    Dictionary<string, BinaryData> dictionary = new Dictionary<string, BinaryData>();
+                    Dictionary<string, DataFactoryElement<string>> dictionary = new Dictionary<string, DataFactoryElement<string>>();
                     foreach (var property0 in property.Value.EnumerateObject())
                     {
                         if (property0.Value.ValueKind == JsonValueKind.Null)
@@ -77,7 +78,7 @@ internal static TriggerPipelineReference DeserializeTriggerPipelineReference(Jso
                         }
                         else
                         {
-                            dictionary.Add(property0.Name, BinaryData.FromString(property0.Value.GetRawText()));
+                            dictionary.Add(property0.Name, JsonSerializer.Deserialize<DataFactoryElement<string>>(property0.Value.GetRawText()));
                         }
                     }
                     parameters = dictionary;
diff --git a/src/AzureDataFactory.TestingFramework/Generated/Models/TriggerPipelineReference.cs b/src/AzureDataFactory.TestingFramework/Generated/Models/TriggerPipelineReference.cs
index 76c45538..58865dac 100644
--- a/src/AzureDataFactory.TestingFramework/Generated/Models/TriggerPipelineReference.cs
+++ b/src/AzureDataFactory.TestingFramework/Generated/Models/TriggerPipelineReference.cs
@@ -6,6 +6,7 @@
 #nullable disable
 
 using Azure.Core;
+using Azure.Core.Expressions.DataFactory;
 
 namespace AzureDataFactory.TestingFramework.Models
 {
@@ -15,13 +16,13 @@ public partial class TriggerPipelineReference
         /// <summary> Initializes a new instance of TriggerPipelineReference. </summary>
         public TriggerPipelineReference()
         {
-            Parameters = new ChangeTrackingDictionary<string, BinaryData>();
+            Parameters = new ChangeTrackingDictionary<string, DataFactoryElement<string>>();
         }
 
         /// <summary> Initializes a new instance of TriggerPipelineReference. </summary>
         /// <param name="pipelineReference"> Pipeline reference. </param>
         /// <param name="parameters"> Pipeline parameters. </param>
-        internal TriggerPipelineReference(DataFactoryPipelineReference pipelineReference, IDictionary<string, BinaryData> parameters)
+        internal TriggerPipelineReference(DataFactoryPipelineReference pipelineReference, IDictionary<string, DataFactoryElement<string>> parameters)
         {
             PipelineReference = pipelineReference;
             Parameters = parameters;
@@ -59,6 +60,6 @@ internal TriggerPipelineReference(DataFactoryPipelineReference pipelineReference
         /// </list>
         /// </para>
         /// </summary>
-        public IDictionary<string, BinaryData> Parameters { get; }
+        public IDictionary<string, DataFactoryElement<string>> Parameters { get; }
     }
 }
diff --git a/src/AzureDataFactory.TestingFramework/Generated/Models/TumblingWindowTrigger.Serialization.cs b/src/AzureDataFactory.TestingFramework/Generated/Models/TumblingWindowTrigger.Serialization.cs
index 9006cfc6..3348419c 100644
--- a/src/AzureDataFactory.TestingFramework/Generated/Models/TumblingWindowTrigger.Serialization.cs
+++ b/src/AzureDataFactory.TestingFramework/Generated/Models/TumblingWindowTrigger.Serialization.cs
@@ -111,8 +111,8 @@ internal static TumblingWindowTrigger DeserializeTumblingWindowTrigger(JsonEleme
             int maxConcurrency = default;
             Optional<RetryPolicy> retryPolicy = default;
             Optional<IList<DependencyReference>> dependsOn = default;
-            IDictionary<string, BinaryData> additionalProperties = default;
-            Dictionary<string, BinaryData> additionalPropertiesDictionary = new Dictionary<string, BinaryData>();
+            IDictionary<string, DataFactoryElement<string>> additionalProperties = default;
+            Dictionary<string, DataFactoryElement<string>> additionalPropertiesDictionary = new Dictionary<string, DataFactoryElement<string>>();
             foreach (var property in element.EnumerateObject())
             {
                 if (property.NameEquals("pipeline"u8))
@@ -233,7 +233,7 @@ internal static TumblingWindowTrigger DeserializeTumblingWindowTrigger(JsonEleme
                     }
                     continue;
                 }
-                additionalPropertiesDictionary.Add(property.Name, BinaryData.FromString(property.Value.GetRawText()));
+                additionalPropertiesDictionary.Add(property.Name, JsonSerializer.Deserialize<DataFactoryElement<string>>(property.Value.GetRawText()));
             }
             additionalProperties = additionalPropertiesDictionary;
             return new TumblingWindowTrigger(type, description.Value, Optional.ToNullable(runtimeState), Optional.ToList(annotations), additionalProperties, pipeline, frequency, interval, startTime, Optional.ToNullable(endTime), delay.Value, maxConcurrency, retryPolicy.Value, Optional.ToList(dependsOn));
diff --git a/src/AzureDataFactory.TestingFramework/Generated/Models/TumblingWindowTrigger.cs b/src/AzureDataFactory.TestingFramework/Generated/Models/TumblingWindowTrigger.cs
index 4840384d..ea73b55b 100644
--- a/src/AzureDataFactory.TestingFramework/Generated/Models/TumblingWindowTrigger.cs
+++ b/src/AzureDataFactory.TestingFramework/Generated/Models/TumblingWindowTrigger.cs
@@ -52,7 +52,7 @@ public TumblingWindowTrigger(TriggerPipelineReference pipeline, TumblingWindowFr
         /// Please note <see cref="DependencyReference"/> is the base class. According to the scenario, a derived class of the base class might need to be assigned here, or this property needs to be casted to one of the possible derived classes.
         /// The available derived classes include <see cref="SelfDependencyTumblingWindowTriggerReference"/>, <see cref="TriggerDependencyReference"/> and <see cref="TumblingWindowTriggerDependencyReference"/>.
         /// </param>
-        internal TumblingWindowTrigger(string triggerType, string description, DataFactoryTriggerRuntimeState? runtimeState, IList<BinaryData> annotations, IDictionary<string, BinaryData> additionalProperties, TriggerPipelineReference pipeline, TumblingWindowFrequency frequency, int interval, DateTimeOffset startOn, DateTimeOffset? endOn, DataFactoryElement<string> delay, int maxConcurrency, RetryPolicy retryPolicy, IList<DependencyReference> dependsOn) : base(triggerType, description, runtimeState, annotations, additionalProperties)
+        internal TumblingWindowTrigger(string triggerType, string description, DataFactoryTriggerRuntimeState? runtimeState, IList<BinaryData> annotations, IDictionary<string, DataFactoryElement<string>> additionalProperties, TriggerPipelineReference pipeline, TumblingWindowFrequency frequency, int interval, DateTimeOffset startOn, DateTimeOffset? endOn, DataFactoryElement<string> delay, int maxConcurrency, RetryPolicy retryPolicy, IList<DependencyReference> dependsOn) : base(triggerType, description, runtimeState, annotations, additionalProperties)
         {
             Pipeline = pipeline;
             Frequency = frequency;
diff --git a/src/AzureDataFactory.TestingFramework/Generated/Models/TwilioLinkedService.Serialization.cs b/src/AzureDataFactory.TestingFramework/Generated/Models/TwilioLinkedService.Serialization.cs
index d194d004..49bd8afd 100644
--- a/src/AzureDataFactory.TestingFramework/Generated/Models/TwilioLinkedService.Serialization.cs
+++ b/src/AzureDataFactory.TestingFramework/Generated/Models/TwilioLinkedService.Serialization.cs
@@ -89,8 +89,8 @@ internal static TwilioLinkedService DeserializeTwilioLinkedService(JsonElement e
             Optional<IList<BinaryData>> annotations = default;
             DataFactoryElement<string> userName = default;
             DataFactorySecretBaseDefinition password = default;
-            IDictionary<string, BinaryData> additionalProperties = default;
-            Dictionary<string, BinaryData> additionalPropertiesDictionary = new Dictionary<string, BinaryData>();
+            IDictionary<string, DataFactoryElement<string>> additionalProperties = default;
+            Dictionary<string, DataFactoryElement<string>> additionalPropertiesDictionary = new Dictionary<string, DataFactoryElement<string>>();
             foreach (var property in element.EnumerateObject())
             {
                 if (property.NameEquals("type"u8))
@@ -169,7 +169,7 @@ internal static TwilioLinkedService DeserializeTwilioLinkedService(JsonElement e
                     }
                     continue;
                 }
-                additionalPropertiesDictionary.Add(property.Name, BinaryData.FromString(property.Value.GetRawText()));
+                additionalPropertiesDictionary.Add(property.Name, JsonSerializer.Deserialize<DataFactoryElement<string>>(property.Value.GetRawText()));
             }
             additionalProperties = additionalPropertiesDictionary;
             return new TwilioLinkedService(type, connectVia.Value, description.Value, Optional.ToDictionary(parameters), Optional.ToList(annotations), additionalProperties, userName, password);
diff --git a/src/AzureDataFactory.TestingFramework/Generated/Models/TwilioLinkedService.cs b/src/AzureDataFactory.TestingFramework/Generated/Models/TwilioLinkedService.cs
index 9a8c38e2..07befe96 100644
--- a/src/AzureDataFactory.TestingFramework/Generated/Models/TwilioLinkedService.cs
+++ b/src/AzureDataFactory.TestingFramework/Generated/Models/TwilioLinkedService.cs
@@ -36,7 +36,7 @@ public TwilioLinkedService(DataFactoryElement<string> userName, DataFactorySecre
         /// <param name="additionalProperties"> Additional Properties. </param>
         /// <param name="userName"> The Account SID of Twilio service. Type: string (or Expression with resultType string). </param>
         /// <param name="password"> The auth token of Twilio service. </param>
-        internal TwilioLinkedService(string linkedServiceType, IntegrationRuntimeReference connectVia, string description, IDictionary<string, EntityParameterSpecification> parameters, IList<BinaryData> annotations, IDictionary<string, BinaryData> additionalProperties, DataFactoryElement<string> userName, DataFactorySecretBaseDefinition password) : base(linkedServiceType, connectVia, description, parameters, annotations, additionalProperties)
+        internal TwilioLinkedService(string linkedServiceType, IntegrationRuntimeReference connectVia, string description, IDictionary<string, EntityParameterSpecification> parameters, IList<BinaryData> annotations, IDictionary<string, DataFactoryElement<string>> additionalProperties, DataFactoryElement<string> userName, DataFactorySecretBaseDefinition password) : base(linkedServiceType, connectVia, description, parameters, annotations, additionalProperties)
         {
             UserName = userName;
             Password = password;
diff --git a/src/AzureDataFactory.TestingFramework/Generated/Models/UnknownActivity.Serialization.cs b/src/AzureDataFactory.TestingFramework/Generated/Models/UnknownActivity.Serialization.cs
index d82f9965..440b3787 100644
--- a/src/AzureDataFactory.TestingFramework/Generated/Models/UnknownActivity.Serialization.cs
+++ b/src/AzureDataFactory.TestingFramework/Generated/Models/UnknownActivity.Serialization.cs
@@ -7,6 +7,7 @@
 
 using System.Text.Json;
 using Azure.Core;
+using Azure.Core.Expressions.DataFactory;
 
 namespace AzureDataFactory.TestingFramework.Models
 {
@@ -79,8 +80,8 @@ internal static UnknownActivity DeserializeUnknownActivity(JsonElement element)
             Optional<ActivityOnInactiveMarkAs> onInactiveMarkAs = default;
             Optional<IList<PipelineActivityDependency>> dependsOn = default;
             Optional<IList<PipelineActivityUserProperty>> userProperties = default;
-            IDictionary<string, BinaryData> additionalProperties = default;
-            Dictionary<string, BinaryData> additionalPropertiesDictionary = new Dictionary<string, BinaryData>();
+            IDictionary<string, DataFactoryElement<string>> additionalProperties = default;
+            Dictionary<string, DataFactoryElement<string>> additionalPropertiesDictionary = new Dictionary<string, DataFactoryElement<string>>();
             foreach (var property in element.EnumerateObject())
             {
                 if (property.NameEquals("name"u8))
@@ -144,7 +145,7 @@ internal static UnknownActivity DeserializeUnknownActivity(JsonElement element)
                     userProperties = array;
                     continue;
                 }
-                additionalPropertiesDictionary.Add(property.Name, BinaryData.FromString(property.Value.GetRawText()));
+                additionalPropertiesDictionary.Add(property.Name, JsonSerializer.Deserialize<DataFactoryElement<string>>(property.Value.GetRawText()));
             }
             additionalProperties = additionalPropertiesDictionary;
             return new UnknownActivity(name, type, description.Value, Optional.ToNullable(state), Optional.ToNullable(onInactiveMarkAs), Optional.ToList(dependsOn), Optional.ToList(userProperties), additionalProperties);
diff --git a/src/AzureDataFactory.TestingFramework/Generated/Models/UnknownActivity.cs b/src/AzureDataFactory.TestingFramework/Generated/Models/UnknownActivity.cs
index 78e3b81f..3f3c0bed 100644
--- a/src/AzureDataFactory.TestingFramework/Generated/Models/UnknownActivity.cs
+++ b/src/AzureDataFactory.TestingFramework/Generated/Models/UnknownActivity.cs
@@ -5,6 +5,8 @@
 
 #nullable disable
 
+using Azure.Core.Expressions.DataFactory;
+
 namespace AzureDataFactory.TestingFramework.Models
 {
     /// <summary> The UnknownActivity. </summary>
@@ -19,7 +21,7 @@ internal partial class UnknownActivity : PipelineActivity
         /// <param name="dependsOn"> Activity depends on condition. </param>
         /// <param name="userProperties"> Activity user properties. </param>
         /// <param name="additionalProperties"> Additional Properties. </param>
-        internal UnknownActivity(string name, string activityType, string description, PipelineActivityState? state, ActivityOnInactiveMarkAs? onInactiveMarkAs, IList<PipelineActivityDependency> dependsOn, IList<PipelineActivityUserProperty> userProperties, IDictionary<string, BinaryData> additionalProperties) : base(name, activityType, description, state, onInactiveMarkAs, dependsOn, userProperties, additionalProperties)
+        internal UnknownActivity(string name, string activityType, string description, PipelineActivityState? state, ActivityOnInactiveMarkAs? onInactiveMarkAs, IList<PipelineActivityDependency> dependsOn, IList<PipelineActivityUserProperty> userProperties, IDictionary<string, DataFactoryElement<string>> additionalProperties) : base(name, activityType, description, state, onInactiveMarkAs, dependsOn, userProperties, additionalProperties)
         {
             ActivityType = activityType ?? "Unknown";
         }
diff --git a/src/AzureDataFactory.TestingFramework/Generated/Models/UnknownCompressionReadSettings.Serialization.cs b/src/AzureDataFactory.TestingFramework/Generated/Models/UnknownCompressionReadSettings.Serialization.cs
index fe9002db..c7049fc4 100644
--- a/src/AzureDataFactory.TestingFramework/Generated/Models/UnknownCompressionReadSettings.Serialization.cs
+++ b/src/AzureDataFactory.TestingFramework/Generated/Models/UnknownCompressionReadSettings.Serialization.cs
@@ -7,6 +7,7 @@
 
 using System.Text.Json;
 using Azure.Core;
+using Azure.Core.Expressions.DataFactory;
 
 namespace AzureDataFactory.TestingFramework.Models
 {
@@ -36,8 +37,8 @@ internal static UnknownCompressionReadSettings DeserializeUnknownCompressionRead
                 return null;
             }
             string type = "Unknown";
-            IDictionary<string, BinaryData> additionalProperties = default;
-            Dictionary<string, BinaryData> additionalPropertiesDictionary = new Dictionary<string, BinaryData>();
+            IDictionary<string, DataFactoryElement<string>> additionalProperties = default;
+            Dictionary<string, DataFactoryElement<string>> additionalPropertiesDictionary = new Dictionary<string, DataFactoryElement<string>>();
             foreach (var property in element.EnumerateObject())
             {
                 if (property.NameEquals("type"u8))
@@ -45,7 +46,7 @@ internal static UnknownCompressionReadSettings DeserializeUnknownCompressionRead
                     type = property.Value.GetString();
                     continue;
                 }
-                additionalPropertiesDictionary.Add(property.Name, BinaryData.FromString(property.Value.GetRawText()));
+                additionalPropertiesDictionary.Add(property.Name, JsonSerializer.Deserialize<DataFactoryElement<string>>(property.Value.GetRawText()));
             }
             additionalProperties = additionalPropertiesDictionary;
             return new UnknownCompressionReadSettings(type, additionalProperties);
diff --git a/src/AzureDataFactory.TestingFramework/Generated/Models/UnknownCompressionReadSettings.cs b/src/AzureDataFactory.TestingFramework/Generated/Models/UnknownCompressionReadSettings.cs
index 2957a82f..c6177909 100644
--- a/src/AzureDataFactory.TestingFramework/Generated/Models/UnknownCompressionReadSettings.cs
+++ b/src/AzureDataFactory.TestingFramework/Generated/Models/UnknownCompressionReadSettings.cs
@@ -5,6 +5,8 @@
 
 #nullable disable
 
+using Azure.Core.Expressions.DataFactory;
+
 namespace AzureDataFactory.TestingFramework.Models
 {
     /// <summary> The UnknownCompressionReadSettings. </summary>
@@ -13,7 +15,7 @@ internal partial class UnknownCompressionReadSettings : CompressionReadSettings
         /// <summary> Initializes a new instance of UnknownCompressionReadSettings. </summary>
         /// <param name="compressionReadSettingsType"> The Compression setting type. </param>
         /// <param name="additionalProperties"> Additional Properties. </param>
-        internal UnknownCompressionReadSettings(string compressionReadSettingsType, IDictionary<string, BinaryData> additionalProperties) : base(compressionReadSettingsType, additionalProperties)
+        internal UnknownCompressionReadSettings(string compressionReadSettingsType, IDictionary<string, DataFactoryElement<string>> additionalProperties) : base(compressionReadSettingsType, additionalProperties)
         {
             CompressionReadSettingsType = compressionReadSettingsType ?? "Unknown";
         }
diff --git a/src/AzureDataFactory.TestingFramework/Generated/Models/UnknownCopySink.Serialization.cs b/src/AzureDataFactory.TestingFramework/Generated/Models/UnknownCopySink.Serialization.cs
index b21dd5b3..1bac3857 100644
--- a/src/AzureDataFactory.TestingFramework/Generated/Models/UnknownCopySink.Serialization.cs
+++ b/src/AzureDataFactory.TestingFramework/Generated/Models/UnknownCopySink.Serialization.cs
@@ -73,8 +73,8 @@ internal static UnknownCopySink DeserializeUnknownCopySink(JsonElement element)
             Optional<DataFactoryElement<string>> sinkRetryWait = default;
             Optional<DataFactoryElement<int>> maxConcurrentConnections = default;
             Optional<DataFactoryElement<bool>> disableMetricsCollection = default;
-            IDictionary<string, BinaryData> additionalProperties = default;
-            Dictionary<string, BinaryData> additionalPropertiesDictionary = new Dictionary<string, BinaryData>();
+            IDictionary<string, DataFactoryElement<string>> additionalProperties = default;
+            Dictionary<string, DataFactoryElement<string>> additionalPropertiesDictionary = new Dictionary<string, DataFactoryElement<string>>();
             foreach (var property in element.EnumerateObject())
             {
                 if (property.NameEquals("type"u8))
@@ -136,7 +136,7 @@ internal static UnknownCopySink DeserializeUnknownCopySink(JsonElement element)
                     disableMetricsCollection = JsonSerializer.Deserialize<DataFactoryElement<bool>>(property.Value.GetRawText());
                     continue;
                 }
-                additionalPropertiesDictionary.Add(property.Name, BinaryData.FromString(property.Value.GetRawText()));
+                additionalPropertiesDictionary.Add(property.Name, JsonSerializer.Deserialize<DataFactoryElement<string>>(property.Value.GetRawText()));
             }
             additionalProperties = additionalPropertiesDictionary;
             return new UnknownCopySink(type, writeBatchSize.Value, writeBatchTimeout.Value, sinkRetryCount.Value, sinkRetryWait.Value, maxConcurrentConnections.Value, disableMetricsCollection.Value, additionalProperties);
diff --git a/src/AzureDataFactory.TestingFramework/Generated/Models/UnknownCopySink.cs b/src/AzureDataFactory.TestingFramework/Generated/Models/UnknownCopySink.cs
index d67a537c..63ed8e26 100644
--- a/src/AzureDataFactory.TestingFramework/Generated/Models/UnknownCopySink.cs
+++ b/src/AzureDataFactory.TestingFramework/Generated/Models/UnknownCopySink.cs
@@ -21,7 +21,7 @@ internal partial class UnknownCopySink : CopySink
         /// <param name="maxConcurrentConnections"> The maximum concurrent connection count for the sink data store. Type: integer (or Expression with resultType integer). </param>
         /// <param name="disableMetricsCollection"> If true, disable data store metrics collection. Default is false. Type: boolean (or Expression with resultType boolean). </param>
         /// <param name="additionalProperties"> Additional Properties. </param>
-        internal UnknownCopySink(string copySinkType, DataFactoryElement<int> writeBatchSize, DataFactoryElement<string> writeBatchTimeout, DataFactoryElement<int> sinkRetryCount, DataFactoryElement<string> sinkRetryWait, DataFactoryElement<int> maxConcurrentConnections, DataFactoryElement<bool> disableMetricsCollection, IDictionary<string, BinaryData> additionalProperties) : base(copySinkType, writeBatchSize, writeBatchTimeout, sinkRetryCount, sinkRetryWait, maxConcurrentConnections, disableMetricsCollection, additionalProperties)
+        internal UnknownCopySink(string copySinkType, DataFactoryElement<int> writeBatchSize, DataFactoryElement<string> writeBatchTimeout, DataFactoryElement<int> sinkRetryCount, DataFactoryElement<string> sinkRetryWait, DataFactoryElement<int> maxConcurrentConnections, DataFactoryElement<bool> disableMetricsCollection, IDictionary<string, DataFactoryElement<string>> additionalProperties) : base(copySinkType, writeBatchSize, writeBatchTimeout, sinkRetryCount, sinkRetryWait, maxConcurrentConnections, disableMetricsCollection, additionalProperties)
         {
             CopySinkType = copySinkType ?? "Unknown";
         }
diff --git a/src/AzureDataFactory.TestingFramework/Generated/Models/UnknownCopySource.Serialization.cs b/src/AzureDataFactory.TestingFramework/Generated/Models/UnknownCopySource.Serialization.cs
index a58e7261..7729d7ca 100644
--- a/src/AzureDataFactory.TestingFramework/Generated/Models/UnknownCopySource.Serialization.cs
+++ b/src/AzureDataFactory.TestingFramework/Generated/Models/UnknownCopySource.Serialization.cs
@@ -61,8 +61,8 @@ internal static UnknownCopySource DeserializeUnknownCopySource(JsonElement eleme
             Optional<DataFactoryElement<string>> sourceRetryWait = default;
             Optional<DataFactoryElement<int>> maxConcurrentConnections = default;
             Optional<DataFactoryElement<bool>> disableMetricsCollection = default;
-            IDictionary<string, BinaryData> additionalProperties = default;
-            Dictionary<string, BinaryData> additionalPropertiesDictionary = new Dictionary<string, BinaryData>();
+            IDictionary<string, DataFactoryElement<string>> additionalProperties = default;
+            Dictionary<string, DataFactoryElement<string>> additionalPropertiesDictionary = new Dictionary<string, DataFactoryElement<string>>();
             foreach (var property in element.EnumerateObject())
             {
                 if (property.NameEquals("type"u8))
@@ -106,7 +106,7 @@ internal static UnknownCopySource DeserializeUnknownCopySource(JsonElement eleme
                     disableMetricsCollection = JsonSerializer.Deserialize<DataFactoryElement<bool>>(property.Value.GetRawText());
                     continue;
                 }
-                additionalPropertiesDictionary.Add(property.Name, BinaryData.FromString(property.Value.GetRawText()));
+                additionalPropertiesDictionary.Add(property.Name, JsonSerializer.Deserialize<DataFactoryElement<string>>(property.Value.GetRawText()));
             }
             additionalProperties = additionalPropertiesDictionary;
             return new UnknownCopySource(type, sourceRetryCount.Value, sourceRetryWait.Value, maxConcurrentConnections.Value, disableMetricsCollection.Value, additionalProperties);
diff --git a/src/AzureDataFactory.TestingFramework/Generated/Models/UnknownCopySource.cs b/src/AzureDataFactory.TestingFramework/Generated/Models/UnknownCopySource.cs
index 6c7bed99..ba8e60a2 100644
--- a/src/AzureDataFactory.TestingFramework/Generated/Models/UnknownCopySource.cs
+++ b/src/AzureDataFactory.TestingFramework/Generated/Models/UnknownCopySource.cs
@@ -19,7 +19,7 @@ internal partial class UnknownCopySource : CopyActivitySource
         /// <param name="maxConcurrentConnections"> The maximum concurrent connection count for the source data store. Type: integer (or Expression with resultType integer). </param>
         /// <param name="disableMetricsCollection"> If true, disable data store metrics collection. Default is false. Type: boolean (or Expression with resultType boolean). </param>
         /// <param name="additionalProperties"> Additional Properties. </param>
-        internal UnknownCopySource(string copySourceType, DataFactoryElement<int> sourceRetryCount, DataFactoryElement<string> sourceRetryWait, DataFactoryElement<int> maxConcurrentConnections, DataFactoryElement<bool> disableMetricsCollection, IDictionary<string, BinaryData> additionalProperties) : base(copySourceType, sourceRetryCount, sourceRetryWait, maxConcurrentConnections, disableMetricsCollection, additionalProperties)
+        internal UnknownCopySource(string copySourceType, DataFactoryElement<int> sourceRetryCount, DataFactoryElement<string> sourceRetryWait, DataFactoryElement<int> maxConcurrentConnections, DataFactoryElement<bool> disableMetricsCollection, IDictionary<string, DataFactoryElement<string>> additionalProperties) : base(copySourceType, sourceRetryCount, sourceRetryWait, maxConcurrentConnections, disableMetricsCollection, additionalProperties)
         {
             CopySourceType = copySourceType ?? "Unknown";
         }
diff --git a/src/AzureDataFactory.TestingFramework/Generated/Models/UnknownCredential.Serialization.cs b/src/AzureDataFactory.TestingFramework/Generated/Models/UnknownCredential.Serialization.cs
index a6051c8d..ca65d5ca 100644
--- a/src/AzureDataFactory.TestingFramework/Generated/Models/UnknownCredential.Serialization.cs
+++ b/src/AzureDataFactory.TestingFramework/Generated/Models/UnknownCredential.Serialization.cs
@@ -7,6 +7,7 @@
 
 using System.Text.Json;
 using Azure.Core;
+using Azure.Core.Expressions.DataFactory;
 
 namespace AzureDataFactory.TestingFramework.Models
 {
@@ -62,8 +63,8 @@ internal static UnknownCredential DeserializeUnknownCredential(JsonElement eleme
             string type = "Unknown";
             Optional<string> description = default;
             Optional<IList<BinaryData>> annotations = default;
-            IDictionary<string, BinaryData> additionalProperties = default;
-            Dictionary<string, BinaryData> additionalPropertiesDictionary = new Dictionary<string, BinaryData>();
+            IDictionary<string, DataFactoryElement<string>> additionalProperties = default;
+            Dictionary<string, DataFactoryElement<string>> additionalPropertiesDictionary = new Dictionary<string, DataFactoryElement<string>>();
             foreach (var property in element.EnumerateObject())
             {
                 if (property.NameEquals("type"u8))
@@ -97,7 +98,7 @@ internal static UnknownCredential DeserializeUnknownCredential(JsonElement eleme
                     annotations = array;
                     continue;
                 }
-                additionalPropertiesDictionary.Add(property.Name, BinaryData.FromString(property.Value.GetRawText()));
+                additionalPropertiesDictionary.Add(property.Name, JsonSerializer.Deserialize<DataFactoryElement<string>>(property.Value.GetRawText()));
             }
             additionalProperties = additionalPropertiesDictionary;
             return new UnknownCredential(type, description.Value, Optional.ToList(annotations), additionalProperties);
diff --git a/src/AzureDataFactory.TestingFramework/Generated/Models/UnknownCredential.cs b/src/AzureDataFactory.TestingFramework/Generated/Models/UnknownCredential.cs
index 52bffc19..8dd3d660 100644
--- a/src/AzureDataFactory.TestingFramework/Generated/Models/UnknownCredential.cs
+++ b/src/AzureDataFactory.TestingFramework/Generated/Models/UnknownCredential.cs
@@ -5,6 +5,8 @@
 
 #nullable disable
 
+using Azure.Core.Expressions.DataFactory;
+
 namespace AzureDataFactory.TestingFramework.Models
 {
     /// <summary> The UnknownCredential. </summary>
@@ -15,7 +17,7 @@ internal partial class UnknownCredential : DataFactoryCredential
         /// <param name="description"> Credential description. </param>
         /// <param name="annotations"> List of tags that can be used for describing the Credential. </param>
         /// <param name="additionalProperties"> Additional Properties. </param>
-        internal UnknownCredential(string credentialType, string description, IList<BinaryData> annotations, IDictionary<string, BinaryData> additionalProperties) : base(credentialType, description, annotations, additionalProperties)
+        internal UnknownCredential(string credentialType, string description, IList<BinaryData> annotations, IDictionary<string, DataFactoryElement<string>> additionalProperties) : base(credentialType, description, annotations, additionalProperties)
         {
             CredentialType = credentialType ?? "Unknown";
         }
diff --git a/src/AzureDataFactory.TestingFramework/Generated/Models/UnknownDataset.Serialization.cs b/src/AzureDataFactory.TestingFramework/Generated/Models/UnknownDataset.Serialization.cs
index 5f734125..aa2c7d75 100644
--- a/src/AzureDataFactory.TestingFramework/Generated/Models/UnknownDataset.Serialization.cs
+++ b/src/AzureDataFactory.TestingFramework/Generated/Models/UnknownDataset.Serialization.cs
@@ -95,8 +95,8 @@ internal static UnknownDataset DeserializeUnknownDataset(JsonElement element)
             Optional<IDictionary<string, EntityParameterSpecification>> parameters = default;
             Optional<IList<BinaryData>> annotations = default;
             Optional<DatasetFolder> folder = default;
-            IDictionary<string, BinaryData> additionalProperties = default;
-            Dictionary<string, BinaryData> additionalPropertiesDictionary = new Dictionary<string, BinaryData>();
+            IDictionary<string, DataFactoryElement<string>> additionalProperties = default;
+            Dictionary<string, DataFactoryElement<string>> additionalPropertiesDictionary = new Dictionary<string, DataFactoryElement<string>>();
             foreach (var property in element.EnumerateObject())
             {
                 if (property.NameEquals("type"u8))
@@ -176,7 +176,7 @@ internal static UnknownDataset DeserializeUnknownDataset(JsonElement element)
                     folder = DatasetFolder.DeserializeDatasetFolder(property.Value);
                     continue;
                 }
-                additionalPropertiesDictionary.Add(property.Name, BinaryData.FromString(property.Value.GetRawText()));
+                additionalPropertiesDictionary.Add(property.Name, JsonSerializer.Deserialize<DataFactoryElement<string>>(property.Value.GetRawText()));
             }
             additionalProperties = additionalPropertiesDictionary;
             return new UnknownDataset(type, description.Value, structure.Value, schema.Value, linkedServiceName, Optional.ToDictionary(parameters), Optional.ToList(annotations), folder.Value, additionalProperties);
diff --git a/src/AzureDataFactory.TestingFramework/Generated/Models/UnknownDataset.cs b/src/AzureDataFactory.TestingFramework/Generated/Models/UnknownDataset.cs
index 571824c9..a3db0dac 100644
--- a/src/AzureDataFactory.TestingFramework/Generated/Models/UnknownDataset.cs
+++ b/src/AzureDataFactory.TestingFramework/Generated/Models/UnknownDataset.cs
@@ -22,7 +22,7 @@ internal partial class UnknownDataset : DataFactoryDatasetProperties
         /// <param name="annotations"> List of tags that can be used for describing the Dataset. </param>
         /// <param name="folder"> The folder that this Dataset is in. If not specified, Dataset will appear at the root level. </param>
         /// <param name="additionalProperties"> Additional Properties. </param>
-        internal UnknownDataset(string datasetType, string description, DataFactoryElement<IList<DatasetDataElement>> structure, DataFactoryElement<IList<DatasetSchemaDataElement>> schema, DataFactoryLinkedServiceReference linkedServiceName, IDictionary<string, EntityParameterSpecification> parameters, IList<BinaryData> annotations, DatasetFolder folder, IDictionary<string, BinaryData> additionalProperties) : base(datasetType, description, structure, schema, linkedServiceName, parameters, annotations, folder, additionalProperties)
+        internal UnknownDataset(string datasetType, string description, DataFactoryElement<IList<DatasetDataElement>> structure, DataFactoryElement<IList<DatasetSchemaDataElement>> schema, DataFactoryLinkedServiceReference linkedServiceName, IDictionary<string, EntityParameterSpecification> parameters, IList<BinaryData> annotations, DatasetFolder folder, IDictionary<string, DataFactoryElement<string>> additionalProperties) : base(datasetType, description, structure, schema, linkedServiceName, parameters, annotations, folder, additionalProperties)
         {
             DatasetType = datasetType ?? "Unknown";
         }
diff --git a/src/AzureDataFactory.TestingFramework/Generated/Models/UnknownDatasetLocation.Serialization.cs b/src/AzureDataFactory.TestingFramework/Generated/Models/UnknownDatasetLocation.Serialization.cs
index e5b42cf9..13facf0f 100644
--- a/src/AzureDataFactory.TestingFramework/Generated/Models/UnknownDatasetLocation.Serialization.cs
+++ b/src/AzureDataFactory.TestingFramework/Generated/Models/UnknownDatasetLocation.Serialization.cs
@@ -49,8 +49,8 @@ internal static UnknownDatasetLocation DeserializeUnknownDatasetLocation(JsonEle
             string type = "Unknown";
             Optional<DataFactoryElement<string>> folderPath = default;
             Optional<DataFactoryElement<string>> fileName = default;
-            IDictionary<string, BinaryData> additionalProperties = default;
-            Dictionary<string, BinaryData> additionalPropertiesDictionary = new Dictionary<string, BinaryData>();
+            IDictionary<string, DataFactoryElement<string>> additionalProperties = default;
+            Dictionary<string, DataFactoryElement<string>> additionalPropertiesDictionary = new Dictionary<string, DataFactoryElement<string>>();
             foreach (var property in element.EnumerateObject())
             {
                 if (property.NameEquals("type"u8))
@@ -76,7 +76,7 @@ internal static UnknownDatasetLocation DeserializeUnknownDatasetLocation(JsonEle
                     fileName = JsonSerializer.Deserialize<DataFactoryElement<string>>(property.Value.GetRawText());
                     continue;
                 }
-                additionalPropertiesDictionary.Add(property.Name, BinaryData.FromString(property.Value.GetRawText()));
+                additionalPropertiesDictionary.Add(property.Name, JsonSerializer.Deserialize<DataFactoryElement<string>>(property.Value.GetRawText()));
             }
             additionalProperties = additionalPropertiesDictionary;
             return new UnknownDatasetLocation(type, folderPath.Value, fileName.Value, additionalProperties);
diff --git a/src/AzureDataFactory.TestingFramework/Generated/Models/UnknownDatasetLocation.cs b/src/AzureDataFactory.TestingFramework/Generated/Models/UnknownDatasetLocation.cs
index e9931457..f762b85f 100644
--- a/src/AzureDataFactory.TestingFramework/Generated/Models/UnknownDatasetLocation.cs
+++ b/src/AzureDataFactory.TestingFramework/Generated/Models/UnknownDatasetLocation.cs
@@ -17,7 +17,7 @@ internal partial class UnknownDatasetLocation : DatasetLocation
         /// <param name="folderPath"> Specify the folder path of dataset. Type: string (or Expression with resultType string). </param>
         /// <param name="fileName"> Specify the file name of dataset. Type: string (or Expression with resultType string). </param>
         /// <param name="additionalProperties"> Additional Properties. </param>
-        internal UnknownDatasetLocation(string datasetLocationType, DataFactoryElement<string> folderPath, DataFactoryElement<string> fileName, IDictionary<string, BinaryData> additionalProperties) : base(datasetLocationType, folderPath, fileName, additionalProperties)
+        internal UnknownDatasetLocation(string datasetLocationType, DataFactoryElement<string> folderPath, DataFactoryElement<string> fileName, IDictionary<string, DataFactoryElement<string>> additionalProperties) : base(datasetLocationType, folderPath, fileName, additionalProperties)
         {
             DatasetLocationType = datasetLocationType ?? "Unknown";
         }
diff --git a/src/AzureDataFactory.TestingFramework/Generated/Models/UnknownDatasetStorageFormat.Serialization.cs b/src/AzureDataFactory.TestingFramework/Generated/Models/UnknownDatasetStorageFormat.Serialization.cs
index 2b38eea4..264316c2 100644
--- a/src/AzureDataFactory.TestingFramework/Generated/Models/UnknownDatasetStorageFormat.Serialization.cs
+++ b/src/AzureDataFactory.TestingFramework/Generated/Models/UnknownDatasetStorageFormat.Serialization.cs
@@ -49,8 +49,8 @@ internal static UnknownDatasetStorageFormat DeserializeUnknownDatasetStorageForm
             string type = "Unknown";
             Optional<DataFactoryElement<string>> serializer = default;
             Optional<DataFactoryElement<string>> deserializer = default;
-            IDictionary<string, BinaryData> additionalProperties = default;
-            Dictionary<string, BinaryData> additionalPropertiesDictionary = new Dictionary<string, BinaryData>();
+            IDictionary<string, DataFactoryElement<string>> additionalProperties = default;
+            Dictionary<string, DataFactoryElement<string>> additionalPropertiesDictionary = new Dictionary<string, DataFactoryElement<string>>();
             foreach (var property in element.EnumerateObject())
             {
                 if (property.NameEquals("type"u8))
@@ -76,7 +76,7 @@ internal static UnknownDatasetStorageFormat DeserializeUnknownDatasetStorageForm
                     deserializer = JsonSerializer.Deserialize<DataFactoryElement<string>>(property.Value.GetRawText());
                     continue;
                 }
-                additionalPropertiesDictionary.Add(property.Name, BinaryData.FromString(property.Value.GetRawText()));
+                additionalPropertiesDictionary.Add(property.Name, JsonSerializer.Deserialize<DataFactoryElement<string>>(property.Value.GetRawText()));
             }
             additionalProperties = additionalPropertiesDictionary;
             return new UnknownDatasetStorageFormat(type, serializer.Value, deserializer.Value, additionalProperties);
diff --git a/src/AzureDataFactory.TestingFramework/Generated/Models/UnknownDatasetStorageFormat.cs b/src/AzureDataFactory.TestingFramework/Generated/Models/UnknownDatasetStorageFormat.cs
index fb33b29c..48bcaf91 100644
--- a/src/AzureDataFactory.TestingFramework/Generated/Models/UnknownDatasetStorageFormat.cs
+++ b/src/AzureDataFactory.TestingFramework/Generated/Models/UnknownDatasetStorageFormat.cs
@@ -17,7 +17,7 @@ internal partial class UnknownDatasetStorageFormat : DatasetStorageFormat
         /// <param name="serializer"> Serializer. Type: string (or Expression with resultType string). </param>
         /// <param name="deserializer"> Deserializer. Type: string (or Expression with resultType string). </param>
         /// <param name="additionalProperties"> Additional Properties. </param>
-        internal UnknownDatasetStorageFormat(string datasetStorageFormatType, DataFactoryElement<string> serializer, DataFactoryElement<string> deserializer, IDictionary<string, BinaryData> additionalProperties) : base(datasetStorageFormatType, serializer, deserializer, additionalProperties)
+        internal UnknownDatasetStorageFormat(string datasetStorageFormatType, DataFactoryElement<string> serializer, DataFactoryElement<string> deserializer, IDictionary<string, DataFactoryElement<string>> additionalProperties) : base(datasetStorageFormatType, serializer, deserializer, additionalProperties)
         {
             DatasetStorageFormatType = datasetStorageFormatType ?? "Unknown";
         }
diff --git a/src/AzureDataFactory.TestingFramework/Generated/Models/UnknownExportSettings.Serialization.cs b/src/AzureDataFactory.TestingFramework/Generated/Models/UnknownExportSettings.Serialization.cs
index fd22dbf3..69b2d69f 100644
--- a/src/AzureDataFactory.TestingFramework/Generated/Models/UnknownExportSettings.Serialization.cs
+++ b/src/AzureDataFactory.TestingFramework/Generated/Models/UnknownExportSettings.Serialization.cs
@@ -7,6 +7,7 @@
 
 using System.Text.Json;
 using Azure.Core;
+using Azure.Core.Expressions.DataFactory;
 
 namespace AzureDataFactory.TestingFramework.Models
 {
@@ -36,8 +37,8 @@ internal static UnknownExportSettings DeserializeUnknownExportSettings(JsonEleme
                 return null;
             }
             string type = "Unknown";
-            IDictionary<string, BinaryData> additionalProperties = default;
-            Dictionary<string, BinaryData> additionalPropertiesDictionary = new Dictionary<string, BinaryData>();
+            IDictionary<string, DataFactoryElement<string>> additionalProperties = default;
+            Dictionary<string, DataFactoryElement<string>> additionalPropertiesDictionary = new Dictionary<string, DataFactoryElement<string>>();
             foreach (var property in element.EnumerateObject())
             {
                 if (property.NameEquals("type"u8))
@@ -45,7 +46,7 @@ internal static UnknownExportSettings DeserializeUnknownExportSettings(JsonEleme
                     type = property.Value.GetString();
                     continue;
                 }
-                additionalPropertiesDictionary.Add(property.Name, BinaryData.FromString(property.Value.GetRawText()));
+                additionalPropertiesDictionary.Add(property.Name, JsonSerializer.Deserialize<DataFactoryElement<string>>(property.Value.GetRawText()));
             }
             additionalProperties = additionalPropertiesDictionary;
             return new UnknownExportSettings(type, additionalProperties);
diff --git a/src/AzureDataFactory.TestingFramework/Generated/Models/UnknownExportSettings.cs b/src/AzureDataFactory.TestingFramework/Generated/Models/UnknownExportSettings.cs
index 82281ce6..d705b3f3 100644
--- a/src/AzureDataFactory.TestingFramework/Generated/Models/UnknownExportSettings.cs
+++ b/src/AzureDataFactory.TestingFramework/Generated/Models/UnknownExportSettings.cs
@@ -5,6 +5,8 @@
 
 #nullable disable
 
+using Azure.Core.Expressions.DataFactory;
+
 namespace AzureDataFactory.TestingFramework.Models
 {
     /// <summary> The UnknownExportSettings. </summary>
@@ -13,7 +15,7 @@ internal partial class UnknownExportSettings : ExportSettings
         /// <summary> Initializes a new instance of UnknownExportSettings. </summary>
         /// <param name="exportSettingsType"> The export setting type. </param>
         /// <param name="additionalProperties"> Additional Properties. </param>
-        internal UnknownExportSettings(string exportSettingsType, IDictionary<string, BinaryData> additionalProperties) : base(exportSettingsType, additionalProperties)
+        internal UnknownExportSettings(string exportSettingsType, IDictionary<string, DataFactoryElement<string>> additionalProperties) : base(exportSettingsType, additionalProperties)
         {
             ExportSettingsType = exportSettingsType ?? "Unknown";
         }
diff --git a/src/AzureDataFactory.TestingFramework/Generated/Models/UnknownFormatReadSettings.Serialization.cs b/src/AzureDataFactory.TestingFramework/Generated/Models/UnknownFormatReadSettings.Serialization.cs
index 84f7530b..d5d908f6 100644
--- a/src/AzureDataFactory.TestingFramework/Generated/Models/UnknownFormatReadSettings.Serialization.cs
+++ b/src/AzureDataFactory.TestingFramework/Generated/Models/UnknownFormatReadSettings.Serialization.cs
@@ -7,6 +7,7 @@
 
 using System.Text.Json;
 using Azure.Core;
+using Azure.Core.Expressions.DataFactory;
 
 namespace AzureDataFactory.TestingFramework.Models
 {
@@ -36,8 +37,8 @@ internal static UnknownFormatReadSettings DeserializeUnknownFormatReadSettings(J
                 return null;
             }
             string type = "Unknown";
-            IDictionary<string, BinaryData> additionalProperties = default;
-            Dictionary<string, BinaryData> additionalPropertiesDictionary = new Dictionary<string, BinaryData>();
+            IDictionary<string, DataFactoryElement<string>> additionalProperties = default;
+            Dictionary<string, DataFactoryElement<string>> additionalPropertiesDictionary = new Dictionary<string, DataFactoryElement<string>>();
             foreach (var property in element.EnumerateObject())
             {
                 if (property.NameEquals("type"u8))
@@ -45,7 +46,7 @@ internal static UnknownFormatReadSettings DeserializeUnknownFormatReadSettings(J
                     type = property.Value.GetString();
                     continue;
                 }
-                additionalPropertiesDictionary.Add(property.Name, BinaryData.FromString(property.Value.GetRawText()));
+                additionalPropertiesDictionary.Add(property.Name, JsonSerializer.Deserialize<DataFactoryElement<string>>(property.Value.GetRawText()));
             }
             additionalProperties = additionalPropertiesDictionary;
             return new UnknownFormatReadSettings(type, additionalProperties);
diff --git a/src/AzureDataFactory.TestingFramework/Generated/Models/UnknownFormatReadSettings.cs b/src/AzureDataFactory.TestingFramework/Generated/Models/UnknownFormatReadSettings.cs
index 52a504ca..868d9166 100644
--- a/src/AzureDataFactory.TestingFramework/Generated/Models/UnknownFormatReadSettings.cs
+++ b/src/AzureDataFactory.TestingFramework/Generated/Models/UnknownFormatReadSettings.cs
@@ -5,6 +5,8 @@
 
 #nullable disable
 
+using Azure.Core.Expressions.DataFactory;
+
 namespace AzureDataFactory.TestingFramework.Models
 {
     /// <summary> The UnknownFormatReadSettings. </summary>
@@ -13,7 +15,7 @@ internal partial class UnknownFormatReadSettings : FormatReadSettings
         /// <summary> Initializes a new instance of UnknownFormatReadSettings. </summary>
         /// <param name="formatReadSettingsType"> The read setting type. </param>
         /// <param name="additionalProperties"> Additional Properties. </param>
-        internal UnknownFormatReadSettings(string formatReadSettingsType, IDictionary<string, BinaryData> additionalProperties) : base(formatReadSettingsType, additionalProperties)
+        internal UnknownFormatReadSettings(string formatReadSettingsType, IDictionary<string, DataFactoryElement<string>> additionalProperties) : base(formatReadSettingsType, additionalProperties)
         {
             FormatReadSettingsType = formatReadSettingsType ?? "Unknown";
         }
diff --git a/src/AzureDataFactory.TestingFramework/Generated/Models/UnknownFormatWriteSettings.Serialization.cs b/src/AzureDataFactory.TestingFramework/Generated/Models/UnknownFormatWriteSettings.Serialization.cs
index 7c9d703e..435e50ca 100644
--- a/src/AzureDataFactory.TestingFramework/Generated/Models/UnknownFormatWriteSettings.Serialization.cs
+++ b/src/AzureDataFactory.TestingFramework/Generated/Models/UnknownFormatWriteSettings.Serialization.cs
@@ -7,6 +7,7 @@
 
 using System.Text.Json;
 using Azure.Core;
+using Azure.Core.Expressions.DataFactory;
 
 namespace AzureDataFactory.TestingFramework.Models
 {
@@ -36,8 +37,8 @@ internal static UnknownFormatWriteSettings DeserializeUnknownFormatWriteSettings
                 return null;
             }
             string type = "Unknown";
-            IDictionary<string, BinaryData> additionalProperties = default;
-            Dictionary<string, BinaryData> additionalPropertiesDictionary = new Dictionary<string, BinaryData>();
+            IDictionary<string, DataFactoryElement<string>> additionalProperties = default;
+            Dictionary<string, DataFactoryElement<string>> additionalPropertiesDictionary = new Dictionary<string, DataFactoryElement<string>>();
             foreach (var property in element.EnumerateObject())
             {
                 if (property.NameEquals("type"u8))
@@ -45,7 +46,7 @@ internal static UnknownFormatWriteSettings DeserializeUnknownFormatWriteSettings
                     type = property.Value.GetString();
                     continue;
                 }
-                additionalPropertiesDictionary.Add(property.Name, BinaryData.FromString(property.Value.GetRawText()));
+                additionalPropertiesDictionary.Add(property.Name, JsonSerializer.Deserialize<DataFactoryElement<string>>(property.Value.GetRawText()));
             }
             additionalProperties = additionalPropertiesDictionary;
             return new UnknownFormatWriteSettings(type, additionalProperties);
diff --git a/src/AzureDataFactory.TestingFramework/Generated/Models/UnknownFormatWriteSettings.cs b/src/AzureDataFactory.TestingFramework/Generated/Models/UnknownFormatWriteSettings.cs
index b56bbf9f..f5832947 100644
--- a/src/AzureDataFactory.TestingFramework/Generated/Models/UnknownFormatWriteSettings.cs
+++ b/src/AzureDataFactory.TestingFramework/Generated/Models/UnknownFormatWriteSettings.cs
@@ -5,6 +5,8 @@
 
 #nullable disable
 
+using Azure.Core.Expressions.DataFactory;
+
 namespace AzureDataFactory.TestingFramework.Models
 {
     /// <summary> The UnknownFormatWriteSettings. </summary>
@@ -13,7 +15,7 @@ internal partial class UnknownFormatWriteSettings : FormatWriteSettings
         /// <summary> Initializes a new instance of UnknownFormatWriteSettings. </summary>
         /// <param name="formatWriteSettingsType"> The write setting type. </param>
         /// <param name="additionalProperties"> Additional Properties. </param>
-        internal UnknownFormatWriteSettings(string formatWriteSettingsType, IDictionary<string, BinaryData> additionalProperties) : base(formatWriteSettingsType, additionalProperties)
+        internal UnknownFormatWriteSettings(string formatWriteSettingsType, IDictionary<string, DataFactoryElement<string>> additionalProperties) : base(formatWriteSettingsType, additionalProperties)
         {
             FormatWriteSettingsType = formatWriteSettingsType ?? "Unknown";
         }
diff --git a/src/AzureDataFactory.TestingFramework/Generated/Models/UnknownImportSettings.Serialization.cs b/src/AzureDataFactory.TestingFramework/Generated/Models/UnknownImportSettings.Serialization.cs
index 410c4fc7..803d6eb9 100644
--- a/src/AzureDataFactory.TestingFramework/Generated/Models/UnknownImportSettings.Serialization.cs
+++ b/src/AzureDataFactory.TestingFramework/Generated/Models/UnknownImportSettings.Serialization.cs
@@ -7,6 +7,7 @@
 
 using System.Text.Json;
 using Azure.Core;
+using Azure.Core.Expressions.DataFactory;
 
 namespace AzureDataFactory.TestingFramework.Models
 {
@@ -36,8 +37,8 @@ internal static UnknownImportSettings DeserializeUnknownImportSettings(JsonEleme
                 return null;
             }
             string type = "Unknown";
-            IDictionary<string, BinaryData> additionalProperties = default;
-            Dictionary<string, BinaryData> additionalPropertiesDictionary = new Dictionary<string, BinaryData>();
+            IDictionary<string, DataFactoryElement<string>> additionalProperties = default;
+            Dictionary<string, DataFactoryElement<string>> additionalPropertiesDictionary = new Dictionary<string, DataFactoryElement<string>>();
             foreach (var property in element.EnumerateObject())
             {
                 if (property.NameEquals("type"u8))
@@ -45,7 +46,7 @@ internal static UnknownImportSettings DeserializeUnknownImportSettings(JsonEleme
                     type = property.Value.GetString();
                     continue;
                 }
-                additionalPropertiesDictionary.Add(property.Name, BinaryData.FromString(property.Value.GetRawText()));
+                additionalPropertiesDictionary.Add(property.Name, JsonSerializer.Deserialize<DataFactoryElement<string>>(property.Value.GetRawText()));
             }
             additionalProperties = additionalPropertiesDictionary;
             return new UnknownImportSettings(type, additionalProperties);
diff --git a/src/AzureDataFactory.TestingFramework/Generated/Models/UnknownImportSettings.cs b/src/AzureDataFactory.TestingFramework/Generated/Models/UnknownImportSettings.cs
index c8e04742..d83665eb 100644
--- a/src/AzureDataFactory.TestingFramework/Generated/Models/UnknownImportSettings.cs
+++ b/src/AzureDataFactory.TestingFramework/Generated/Models/UnknownImportSettings.cs
@@ -5,6 +5,8 @@
 
 #nullable disable
 
+using Azure.Core.Expressions.DataFactory;
+
 namespace AzureDataFactory.TestingFramework.Models
 {
     /// <summary> The UnknownImportSettings. </summary>
@@ -13,7 +15,7 @@ internal partial class UnknownImportSettings : ImportSettings
         /// <summary> Initializes a new instance of UnknownImportSettings. </summary>
         /// <param name="importSettingsType"> The import setting type. </param>
         /// <param name="additionalProperties"> Additional Properties. </param>
-        internal UnknownImportSettings(string importSettingsType, IDictionary<string, BinaryData> additionalProperties) : base(importSettingsType, additionalProperties)
+        internal UnknownImportSettings(string importSettingsType, IDictionary<string, DataFactoryElement<string>> additionalProperties) : base(importSettingsType, additionalProperties)
         {
             ImportSettingsType = importSettingsType ?? "Unknown";
         }
diff --git a/src/AzureDataFactory.TestingFramework/Generated/Models/UnknownIntegrationRuntime.Serialization.cs b/src/AzureDataFactory.TestingFramework/Generated/Models/UnknownIntegrationRuntime.Serialization.cs
index 570bb6ad..e695ee83 100644
--- a/src/AzureDataFactory.TestingFramework/Generated/Models/UnknownIntegrationRuntime.Serialization.cs
+++ b/src/AzureDataFactory.TestingFramework/Generated/Models/UnknownIntegrationRuntime.Serialization.cs
@@ -7,6 +7,7 @@
 
 using System.Text.Json;
 using Azure.Core;
+using Azure.Core.Expressions.DataFactory;
 
 namespace AzureDataFactory.TestingFramework.Models
 {
@@ -42,8 +43,8 @@ internal static UnknownIntegrationRuntime DeserializeUnknownIntegrationRuntime(J
             }
             IntegrationRuntimeType type = "Unknown";
             Optional<string> description = default;
-            IDictionary<string, BinaryData> additionalProperties = default;
-            Dictionary<string, BinaryData> additionalPropertiesDictionary = new Dictionary<string, BinaryData>();
+            IDictionary<string, DataFactoryElement<string>> additionalProperties = default;
+            Dictionary<string, DataFactoryElement<string>> additionalPropertiesDictionary = new Dictionary<string, DataFactoryElement<string>>();
             foreach (var property in element.EnumerateObject())
             {
                 if (property.NameEquals("type"u8))
@@ -56,7 +57,7 @@ internal static UnknownIntegrationRuntime DeserializeUnknownIntegrationRuntime(J
                     description = property.Value.GetString();
                     continue;
                 }
-                additionalPropertiesDictionary.Add(property.Name, BinaryData.FromString(property.Value.GetRawText()));
+                additionalPropertiesDictionary.Add(property.Name, JsonSerializer.Deserialize<DataFactoryElement<string>>(property.Value.GetRawText()));
             }
             additionalProperties = additionalPropertiesDictionary;
             return new UnknownIntegrationRuntime(type, description.Value, additionalProperties);
diff --git a/src/AzureDataFactory.TestingFramework/Generated/Models/UnknownIntegrationRuntime.cs b/src/AzureDataFactory.TestingFramework/Generated/Models/UnknownIntegrationRuntime.cs
index 4cdde1d8..6183e1aa 100644
--- a/src/AzureDataFactory.TestingFramework/Generated/Models/UnknownIntegrationRuntime.cs
+++ b/src/AzureDataFactory.TestingFramework/Generated/Models/UnknownIntegrationRuntime.cs
@@ -5,6 +5,8 @@
 
 #nullable disable
 
+using Azure.Core.Expressions.DataFactory;
+
 namespace AzureDataFactory.TestingFramework.Models
 {
     /// <summary> The UnknownIntegrationRuntime. </summary>
@@ -14,7 +16,7 @@ internal partial class UnknownIntegrationRuntime : DataFactoryIntegrationRuntime
         /// <param name="integrationRuntimeType"> Type of integration runtime. </param>
         /// <param name="description"> Integration runtime description. </param>
         /// <param name="additionalProperties"> Additional Properties. </param>
-        internal UnknownIntegrationRuntime(IntegrationRuntimeType integrationRuntimeType, string description, IDictionary<string, BinaryData> additionalProperties) : base(integrationRuntimeType, description, additionalProperties)
+        internal UnknownIntegrationRuntime(IntegrationRuntimeType integrationRuntimeType, string description, IDictionary<string, DataFactoryElement<string>> additionalProperties) : base(integrationRuntimeType, description, additionalProperties)
         {
             IntegrationRuntimeType = integrationRuntimeType;
         }
diff --git a/src/AzureDataFactory.TestingFramework/Generated/Models/UnknownIntegrationRuntimeStatus.Serialization.cs b/src/AzureDataFactory.TestingFramework/Generated/Models/UnknownIntegrationRuntimeStatus.Serialization.cs
index 9a4a32d8..25caf5b9 100644
--- a/src/AzureDataFactory.TestingFramework/Generated/Models/UnknownIntegrationRuntimeStatus.Serialization.cs
+++ b/src/AzureDataFactory.TestingFramework/Generated/Models/UnknownIntegrationRuntimeStatus.Serialization.cs
@@ -7,6 +7,7 @@
 
 using System.Text.Json;
 using Azure.Core;
+using Azure.Core.Expressions.DataFactory;
 
 namespace AzureDataFactory.TestingFramework.Models
 {
@@ -21,8 +22,8 @@ internal static UnknownIntegrationRuntimeStatus DeserializeUnknownIntegrationRun
             IntegrationRuntimeType type = "Unknown";
             Optional<string> dataFactoryName = default;
             Optional<IntegrationRuntimeState> state = default;
-            IReadOnlyDictionary<string, BinaryData> additionalProperties = default;
-            Dictionary<string, BinaryData> additionalPropertiesDictionary = new Dictionary<string, BinaryData>();
+            IReadOnlyDictionary<string, DataFactoryElement<string>> additionalProperties = default;
+            Dictionary<string, DataFactoryElement<string>> additionalPropertiesDictionary = new Dictionary<string, DataFactoryElement<string>>();
             foreach (var property in element.EnumerateObject())
             {
                 if (property.NameEquals("type"u8))
@@ -44,7 +45,7 @@ internal static UnknownIntegrationRuntimeStatus DeserializeUnknownIntegrationRun
                     state = new IntegrationRuntimeState(property.Value.GetString());
                     continue;
                 }
-                additionalPropertiesDictionary.Add(property.Name, BinaryData.FromString(property.Value.GetRawText()));
+                additionalPropertiesDictionary.Add(property.Name, JsonSerializer.Deserialize<DataFactoryElement<string>>(property.Value.GetRawText()));
             }
             additionalProperties = additionalPropertiesDictionary;
             return new UnknownIntegrationRuntimeStatus(type, dataFactoryName.Value, Optional.ToNullable(state), additionalProperties);
diff --git a/src/AzureDataFactory.TestingFramework/Generated/Models/UnknownIntegrationRuntimeStatus.cs b/src/AzureDataFactory.TestingFramework/Generated/Models/UnknownIntegrationRuntimeStatus.cs
index 9cc46af1..3aa0e8d7 100644
--- a/src/AzureDataFactory.TestingFramework/Generated/Models/UnknownIntegrationRuntimeStatus.cs
+++ b/src/AzureDataFactory.TestingFramework/Generated/Models/UnknownIntegrationRuntimeStatus.cs
@@ -5,6 +5,8 @@
 
 #nullable disable
 
+using Azure.Core.Expressions.DataFactory;
+
 namespace AzureDataFactory.TestingFramework.Models
 {
     /// <summary> The UnknownIntegrationRuntimeStatus. </summary>
@@ -15,7 +17,7 @@ internal partial class UnknownIntegrationRuntimeStatus : IntegrationRuntimeStatu
         /// <param name="dataFactoryName"> The data factory name which the integration runtime belong to. </param>
         /// <param name="state"> The state of integration runtime. </param>
         /// <param name="additionalProperties"> Additional Properties. </param>
-        internal UnknownIntegrationRuntimeStatus(IntegrationRuntimeType runtimeType, string dataFactoryName, IntegrationRuntimeState? state, IReadOnlyDictionary<string, BinaryData> additionalProperties) : base(runtimeType, dataFactoryName, state, additionalProperties)
+        internal UnknownIntegrationRuntimeStatus(IntegrationRuntimeType runtimeType, string dataFactoryName, IntegrationRuntimeState? state, IReadOnlyDictionary<string, DataFactoryElement<string>> additionalProperties) : base(runtimeType, dataFactoryName, state, additionalProperties)
         {
             RuntimeType = runtimeType;
         }
diff --git a/src/AzureDataFactory.TestingFramework/Generated/Models/UnknownLinkedService.Serialization.cs b/src/AzureDataFactory.TestingFramework/Generated/Models/UnknownLinkedService.Serialization.cs
index c50c3623..b5afa9bc 100644
--- a/src/AzureDataFactory.TestingFramework/Generated/Models/UnknownLinkedService.Serialization.cs
+++ b/src/AzureDataFactory.TestingFramework/Generated/Models/UnknownLinkedService.Serialization.cs
@@ -7,6 +7,7 @@
 
 using System.Text.Json;
 using Azure.Core;
+using Azure.Core.Expressions.DataFactory;
 
 namespace AzureDataFactory.TestingFramework.Models
 {
@@ -80,8 +81,8 @@ internal static UnknownLinkedService DeserializeUnknownLinkedService(JsonElement
             Optional<string> description = default;
             Optional<IDictionary<string, EntityParameterSpecification>> parameters = default;
             Optional<IList<BinaryData>> annotations = default;
-            IDictionary<string, BinaryData> additionalProperties = default;
-            Dictionary<string, BinaryData> additionalPropertiesDictionary = new Dictionary<string, BinaryData>();
+            IDictionary<string, DataFactoryElement<string>> additionalProperties = default;
+            Dictionary<string, DataFactoryElement<string>> additionalPropertiesDictionary = new Dictionary<string, DataFactoryElement<string>>();
             foreach (var property in element.EnumerateObject())
             {
                 if (property.NameEquals("type"u8))
@@ -138,7 +139,7 @@ internal static UnknownLinkedService DeserializeUnknownLinkedService(JsonElement
                     annotations = array;
                     continue;
                 }
-                additionalPropertiesDictionary.Add(property.Name, BinaryData.FromString(property.Value.GetRawText()));
+                additionalPropertiesDictionary.Add(property.Name, JsonSerializer.Deserialize<DataFactoryElement<string>>(property.Value.GetRawText()));
             }
             additionalProperties = additionalPropertiesDictionary;
             return new UnknownLinkedService(type, connectVia.Value, description.Value, Optional.ToDictionary(parameters), Optional.ToList(annotations), additionalProperties);
diff --git a/src/AzureDataFactory.TestingFramework/Generated/Models/UnknownLinkedService.cs b/src/AzureDataFactory.TestingFramework/Generated/Models/UnknownLinkedService.cs
index 6a293430..85225da2 100644
--- a/src/AzureDataFactory.TestingFramework/Generated/Models/UnknownLinkedService.cs
+++ b/src/AzureDataFactory.TestingFramework/Generated/Models/UnknownLinkedService.cs
@@ -5,6 +5,8 @@
 
 #nullable disable
 
+using Azure.Core.Expressions.DataFactory;
+
 namespace AzureDataFactory.TestingFramework.Models
 {
     /// <summary> The UnknownLinkedService. </summary>
@@ -17,7 +19,7 @@ internal partial class UnknownLinkedService : DataFactoryLinkedServiceProperties
         /// <param name="parameters"> Parameters for linked service. </param>
         /// <param name="annotations"> List of tags that can be used for describing the linked service. </param>
         /// <param name="additionalProperties"> Additional Properties. </param>
-        internal UnknownLinkedService(string linkedServiceType, IntegrationRuntimeReference connectVia, string description, IDictionary<string, EntityParameterSpecification> parameters, IList<BinaryData> annotations, IDictionary<string, BinaryData> additionalProperties) : base(linkedServiceType, connectVia, description, parameters, annotations, additionalProperties)
+        internal UnknownLinkedService(string linkedServiceType, IntegrationRuntimeReference connectVia, string description, IDictionary<string, EntityParameterSpecification> parameters, IList<BinaryData> annotations, IDictionary<string, DataFactoryElement<string>> additionalProperties) : base(linkedServiceType, connectVia, description, parameters, annotations, additionalProperties)
         {
             LinkedServiceType = linkedServiceType ?? "Unknown";
         }
diff --git a/src/AzureDataFactory.TestingFramework/Generated/Models/UnknownStoreReadSettings.Serialization.cs b/src/AzureDataFactory.TestingFramework/Generated/Models/UnknownStoreReadSettings.Serialization.cs
index 9f3de59c..ba23a98f 100644
--- a/src/AzureDataFactory.TestingFramework/Generated/Models/UnknownStoreReadSettings.Serialization.cs
+++ b/src/AzureDataFactory.TestingFramework/Generated/Models/UnknownStoreReadSettings.Serialization.cs
@@ -49,8 +49,8 @@ internal static UnknownStoreReadSettings DeserializeUnknownStoreReadSettings(Jso
             string type = "Unknown";
             Optional<DataFactoryElement<int>> maxConcurrentConnections = default;
             Optional<DataFactoryElement<bool>> disableMetricsCollection = default;
-            IDictionary<string, BinaryData> additionalProperties = default;
-            Dictionary<string, BinaryData> additionalPropertiesDictionary = new Dictionary<string, BinaryData>();
+            IDictionary<string, DataFactoryElement<string>> additionalProperties = default;
+            Dictionary<string, DataFactoryElement<string>> additionalPropertiesDictionary = new Dictionary<string, DataFactoryElement<string>>();
             foreach (var property in element.EnumerateObject())
             {
                 if (property.NameEquals("type"u8))
@@ -76,7 +76,7 @@ internal static UnknownStoreReadSettings DeserializeUnknownStoreReadSettings(Jso
                     disableMetricsCollection = JsonSerializer.Deserialize<DataFactoryElement<bool>>(property.Value.GetRawText());
                     continue;
                 }
-                additionalPropertiesDictionary.Add(property.Name, BinaryData.FromString(property.Value.GetRawText()));
+                additionalPropertiesDictionary.Add(property.Name, JsonSerializer.Deserialize<DataFactoryElement<string>>(property.Value.GetRawText()));
             }
             additionalProperties = additionalPropertiesDictionary;
             return new UnknownStoreReadSettings(type, maxConcurrentConnections.Value, disableMetricsCollection.Value, additionalProperties);
diff --git a/src/AzureDataFactory.TestingFramework/Generated/Models/UnknownStoreReadSettings.cs b/src/AzureDataFactory.TestingFramework/Generated/Models/UnknownStoreReadSettings.cs
index 54296d2e..5fe8bab9 100644
--- a/src/AzureDataFactory.TestingFramework/Generated/Models/UnknownStoreReadSettings.cs
+++ b/src/AzureDataFactory.TestingFramework/Generated/Models/UnknownStoreReadSettings.cs
@@ -17,7 +17,7 @@ internal partial class UnknownStoreReadSettings : StoreReadSettings
         /// <param name="maxConcurrentConnections"> The maximum concurrent connection count for the source data store. Type: integer (or Expression with resultType integer). </param>
         /// <param name="disableMetricsCollection"> If true, disable data store metrics collection. Default is false. Type: boolean (or Expression with resultType boolean). </param>
         /// <param name="additionalProperties"> Additional Properties. </param>
-        internal UnknownStoreReadSettings(string storeReadSettingsType, DataFactoryElement<int> maxConcurrentConnections, DataFactoryElement<bool> disableMetricsCollection, IDictionary<string, BinaryData> additionalProperties) : base(storeReadSettingsType, maxConcurrentConnections, disableMetricsCollection, additionalProperties)
+        internal UnknownStoreReadSettings(string storeReadSettingsType, DataFactoryElement<int> maxConcurrentConnections, DataFactoryElement<bool> disableMetricsCollection, IDictionary<string, DataFactoryElement<string>> additionalProperties) : base(storeReadSettingsType, maxConcurrentConnections, disableMetricsCollection, additionalProperties)
         {
             StoreReadSettingsType = storeReadSettingsType ?? "Unknown";
         }
diff --git a/src/AzureDataFactory.TestingFramework/Generated/Models/UnknownStoreWriteSettings.Serialization.cs b/src/AzureDataFactory.TestingFramework/Generated/Models/UnknownStoreWriteSettings.Serialization.cs
index 46f13a2e..4a2e118a 100644
--- a/src/AzureDataFactory.TestingFramework/Generated/Models/UnknownStoreWriteSettings.Serialization.cs
+++ b/src/AzureDataFactory.TestingFramework/Generated/Models/UnknownStoreWriteSettings.Serialization.cs
@@ -59,8 +59,8 @@ internal static UnknownStoreWriteSettings DeserializeUnknownStoreWriteSettings(J
             Optional<DataFactoryElement<int>> maxConcurrentConnections = default;
             Optional<DataFactoryElement<bool>> disableMetricsCollection = default;
             Optional<BinaryData> copyBehavior = default;
-            IDictionary<string, BinaryData> additionalProperties = default;
-            Dictionary<string, BinaryData> additionalPropertiesDictionary = new Dictionary<string, BinaryData>();
+            IDictionary<string, DataFactoryElement<string>> additionalProperties = default;
+            Dictionary<string, DataFactoryElement<string>> additionalPropertiesDictionary = new Dictionary<string, DataFactoryElement<string>>();
             foreach (var property in element.EnumerateObject())
             {
                 if (property.NameEquals("type"u8))
@@ -95,7 +95,7 @@ internal static UnknownStoreWriteSettings DeserializeUnknownStoreWriteSettings(J
                     copyBehavior = BinaryData.FromString(property.Value.GetRawText());
                     continue;
                 }
-                additionalPropertiesDictionary.Add(property.Name, BinaryData.FromString(property.Value.GetRawText()));
+                additionalPropertiesDictionary.Add(property.Name, JsonSerializer.Deserialize<DataFactoryElement<string>>(property.Value.GetRawText()));
             }
             additionalProperties = additionalPropertiesDictionary;
             return new UnknownStoreWriteSettings(type, maxConcurrentConnections.Value, disableMetricsCollection.Value, copyBehavior.Value, additionalProperties);
diff --git a/src/AzureDataFactory.TestingFramework/Generated/Models/UnknownStoreWriteSettings.cs b/src/AzureDataFactory.TestingFramework/Generated/Models/UnknownStoreWriteSettings.cs
index 2fc507a4..4dc67625 100644
--- a/src/AzureDataFactory.TestingFramework/Generated/Models/UnknownStoreWriteSettings.cs
+++ b/src/AzureDataFactory.TestingFramework/Generated/Models/UnknownStoreWriteSettings.cs
@@ -18,7 +18,7 @@ internal partial class UnknownStoreWriteSettings : StoreWriteSettings
         /// <param name="disableMetricsCollection"> If true, disable data store metrics collection. Default is false. Type: boolean (or Expression with resultType boolean). </param>
         /// <param name="copyBehavior"> The type of copy behavior for copy sink. </param>
         /// <param name="additionalProperties"> Additional Properties. </param>
-        internal UnknownStoreWriteSettings(string storeWriteSettingsType, DataFactoryElement<int> maxConcurrentConnections, DataFactoryElement<bool> disableMetricsCollection, BinaryData copyBehavior, IDictionary<string, BinaryData> additionalProperties) : base(storeWriteSettingsType, maxConcurrentConnections, disableMetricsCollection, copyBehavior, additionalProperties)
+        internal UnknownStoreWriteSettings(string storeWriteSettingsType, DataFactoryElement<int> maxConcurrentConnections, DataFactoryElement<bool> disableMetricsCollection, BinaryData copyBehavior, IDictionary<string, DataFactoryElement<string>> additionalProperties) : base(storeWriteSettingsType, maxConcurrentConnections, disableMetricsCollection, copyBehavior, additionalProperties)
         {
             StoreWriteSettingsType = storeWriteSettingsType ?? "Unknown";
         }
diff --git a/src/AzureDataFactory.TestingFramework/Generated/Models/UnknownTrigger.Serialization.cs b/src/AzureDataFactory.TestingFramework/Generated/Models/UnknownTrigger.Serialization.cs
index 9c092a93..f7cec3b7 100644
--- a/src/AzureDataFactory.TestingFramework/Generated/Models/UnknownTrigger.Serialization.cs
+++ b/src/AzureDataFactory.TestingFramework/Generated/Models/UnknownTrigger.Serialization.cs
@@ -7,6 +7,7 @@
 
 using System.Text.Json;
 using Azure.Core;
+using Azure.Core.Expressions.DataFactory;
 
 namespace AzureDataFactory.TestingFramework.Models
 {
@@ -63,8 +64,8 @@ internal static UnknownTrigger DeserializeUnknownTrigger(JsonElement element)
             Optional<string> description = default;
             Optional<DataFactoryTriggerRuntimeState> runtimeState = default;
             Optional<IList<BinaryData>> annotations = default;
-            IDictionary<string, BinaryData> additionalProperties = default;
-            Dictionary<string, BinaryData> additionalPropertiesDictionary = new Dictionary<string, BinaryData>();
+            IDictionary<string, DataFactoryElement<string>> additionalProperties = default;
+            Dictionary<string, DataFactoryElement<string>> additionalPropertiesDictionary = new Dictionary<string, DataFactoryElement<string>>();
             foreach (var property in element.EnumerateObject())
             {
                 if (property.NameEquals("type"u8))
@@ -107,7 +108,7 @@ internal static UnknownTrigger DeserializeUnknownTrigger(JsonElement element)
                     annotations = array;
                     continue;
                 }
-                additionalPropertiesDictionary.Add(property.Name, BinaryData.FromString(property.Value.GetRawText()));
+                additionalPropertiesDictionary.Add(property.Name, JsonSerializer.Deserialize<DataFactoryElement<string>>(property.Value.GetRawText()));
             }
             additionalProperties = additionalPropertiesDictionary;
             return new UnknownTrigger(type, description.Value, Optional.ToNullable(runtimeState), Optional.ToList(annotations), additionalProperties);
diff --git a/src/AzureDataFactory.TestingFramework/Generated/Models/UnknownTrigger.cs b/src/AzureDataFactory.TestingFramework/Generated/Models/UnknownTrigger.cs
index 48677403..3f20b8fc 100644
--- a/src/AzureDataFactory.TestingFramework/Generated/Models/UnknownTrigger.cs
+++ b/src/AzureDataFactory.TestingFramework/Generated/Models/UnknownTrigger.cs
@@ -5,6 +5,8 @@
 
 #nullable disable
 
+using Azure.Core.Expressions.DataFactory;
+
 namespace AzureDataFactory.TestingFramework.Models
 {
     /// <summary> The UnknownTrigger. </summary>
@@ -16,7 +18,7 @@ internal partial class UnknownTrigger : DataFactoryTriggerProperties
         /// <param name="runtimeState"> Indicates if trigger is running or not. Updated when Start/Stop APIs are called on the Trigger. </param>
         /// <param name="annotations"> List of tags that can be used for describing the trigger. </param>
         /// <param name="additionalProperties"> Additional Properties. </param>
-        internal UnknownTrigger(string triggerType, string description, DataFactoryTriggerRuntimeState? runtimeState, IList<BinaryData> annotations, IDictionary<string, BinaryData> additionalProperties) : base(triggerType, description, runtimeState, annotations, additionalProperties)
+        internal UnknownTrigger(string triggerType, string description, DataFactoryTriggerRuntimeState? runtimeState, IList<BinaryData> annotations, IDictionary<string, DataFactoryElement<string>> additionalProperties) : base(triggerType, description, runtimeState, annotations, additionalProperties)
         {
             TriggerType = triggerType ?? "Unknown";
         }
diff --git a/src/AzureDataFactory.TestingFramework/Generated/Models/UntilActivity.Serialization.cs b/src/AzureDataFactory.TestingFramework/Generated/Models/UntilActivity.Serialization.cs
index b8cedde3..75985d00 100644
--- a/src/AzureDataFactory.TestingFramework/Generated/Models/UntilActivity.Serialization.cs
+++ b/src/AzureDataFactory.TestingFramework/Generated/Models/UntilActivity.Serialization.cs
@@ -100,8 +100,8 @@ internal static UntilActivity DeserializeUntilActivity(JsonElement element)
             DataFactoryExpression expression = default;
             Optional<DataFactoryElement<string>> timeout = default;
             IList<PipelineActivity> activities = default;
-            IDictionary<string, BinaryData> additionalProperties = default;
-            Dictionary<string, BinaryData> additionalPropertiesDictionary = new Dictionary<string, BinaryData>();
+            IDictionary<string, DataFactoryElement<string>> additionalProperties = default;
+            Dictionary<string, DataFactoryElement<string>> additionalPropertiesDictionary = new Dictionary<string, DataFactoryElement<string>>();
             foreach (var property in element.EnumerateObject())
             {
                 if (property.NameEquals("name"u8))
@@ -201,7 +201,7 @@ internal static UntilActivity DeserializeUntilActivity(JsonElement element)
                     }
                     continue;
                 }
-                additionalPropertiesDictionary.Add(property.Name, BinaryData.FromString(property.Value.GetRawText()));
+                additionalPropertiesDictionary.Add(property.Name, JsonSerializer.Deserialize<DataFactoryElement<string>>(property.Value.GetRawText()));
             }
             additionalProperties = additionalPropertiesDictionary;
             return new UntilActivity(name, type, description.Value, Optional.ToNullable(state), Optional.ToNullable(onInactiveMarkAs), Optional.ToList(dependsOn), Optional.ToList(userProperties), additionalProperties, expression, timeout.Value, activities);
diff --git a/src/AzureDataFactory.TestingFramework/Generated/Models/UntilActivity.cs b/src/AzureDataFactory.TestingFramework/Generated/Models/UntilActivity.cs
index bff69127..9237c7e7 100644
--- a/src/AzureDataFactory.TestingFramework/Generated/Models/UntilActivity.cs
+++ b/src/AzureDataFactory.TestingFramework/Generated/Models/UntilActivity.cs
@@ -49,7 +49,7 @@ public UntilActivity(string name, DataFactoryExpression expression, IEnumerable<
         /// Please note <see cref="PipelineActivity"/> is the base class. According to the scenario, a derived class of the base class might need to be assigned here, or this property needs to be casted to one of the possible derived classes.
         /// The available derived classes include <see cref="AppendVariableActivity"/>, <see cref="AzureDataExplorerCommandActivity"/>, <see cref="AzureFunctionActivity"/>, <see cref="AzureMLBatchExecutionActivity"/>, <see cref="AzureMLExecutePipelineActivity"/>, <see cref="AzureMLUpdateResourceActivity"/>, <see cref="ControlActivity"/>, <see cref="CopyActivity"/>, <see cref="CustomActivity"/>, <see cref="DataLakeAnalyticsUsqlActivity"/>, <see cref="DatabricksNotebookActivity"/>, <see cref="DatabricksSparkJarActivity"/>, <see cref="DatabricksSparkPythonActivity"/>, <see cref="DeleteActivity"/>, <see cref="ExecuteDataFlowActivity"/>, <see cref="ExecutePipelineActivity"/>, <see cref="ExecuteSsisPackageActivity"/>, <see cref="ExecuteWranglingDataflowActivity"/>, <see cref="ExecutionActivity"/>, <see cref="FailActivity"/>, <see cref="FilterActivity"/>, <see cref="ForEachActivity"/>, <see cref="GetDatasetMetadataActivity"/>, <see cref="HDInsightHiveActivity"/>, <see cref="HDInsightMapReduceActivity"/>, <see cref="HDInsightPigActivity"/>, <see cref="HDInsightSparkActivity"/>, <see cref="HDInsightStreamingActivity"/>, <see cref="IfConditionActivity"/>, <see cref="LookupActivity"/>, <see cref="DataFactoryScriptActivity"/>, <see cref="SetVariableActivity"/>, <see cref="SynapseSparkJobDefinitionActivity"/>, <see cref="SqlServerStoredProcedureActivity"/>, <see cref="SwitchActivity"/>, <see cref="SynapseNotebookActivity"/>, <see cref="UntilActivity"/>, <see cref="ValidationActivity"/>, <see cref="WaitActivity"/>, <see cref="WebActivity"/> and <see cref="WebHookActivity"/>.
         /// </param>
-        internal UntilActivity(string name, string activityType, string description, PipelineActivityState? state, ActivityOnInactiveMarkAs? onInactiveMarkAs, IList<PipelineActivityDependency> dependsOn, IList<PipelineActivityUserProperty> userProperties, IDictionary<string, BinaryData> additionalProperties, DataFactoryExpression expression, DataFactoryElement<string> timeout, IList<PipelineActivity> activities) : base(name, activityType, description, state, onInactiveMarkAs, dependsOn, userProperties, additionalProperties)
+        internal UntilActivity(string name, string activityType, string description, PipelineActivityState? state, ActivityOnInactiveMarkAs? onInactiveMarkAs, IList<PipelineActivityDependency> dependsOn, IList<PipelineActivityUserProperty> userProperties, IDictionary<string, DataFactoryElement<string>> additionalProperties, DataFactoryExpression expression, DataFactoryElement<string> timeout, IList<PipelineActivity> activities) : base(name, activityType, description, state, onInactiveMarkAs, dependsOn, userProperties, additionalProperties)
         {
             Expression = expression;
             Timeout = timeout;
diff --git a/src/AzureDataFactory.TestingFramework/Generated/Models/ValidationActivity.Serialization.cs b/src/AzureDataFactory.TestingFramework/Generated/Models/ValidationActivity.Serialization.cs
index bfd56493..0506eee0 100644
--- a/src/AzureDataFactory.TestingFramework/Generated/Models/ValidationActivity.Serialization.cs
+++ b/src/AzureDataFactory.TestingFramework/Generated/Models/ValidationActivity.Serialization.cs
@@ -110,8 +110,8 @@ internal static ValidationActivity DeserializeValidationActivity(JsonElement ele
             Optional<DataFactoryElement<int>> minimumSize = default;
             Optional<DataFactoryElement<bool>> childItems = default;
             DatasetReference dataset = default;
-            IDictionary<string, BinaryData> additionalProperties = default;
-            Dictionary<string, BinaryData> additionalPropertiesDictionary = new Dictionary<string, BinaryData>();
+            IDictionary<string, DataFactoryElement<string>> additionalProperties = default;
+            Dictionary<string, DataFactoryElement<string>> additionalPropertiesDictionary = new Dictionary<string, DataFactoryElement<string>>();
             foreach (var property in element.EnumerateObject())
             {
                 if (property.NameEquals("name"u8))
@@ -228,7 +228,7 @@ internal static ValidationActivity DeserializeValidationActivity(JsonElement ele
                     }
                     continue;
                 }
-                additionalPropertiesDictionary.Add(property.Name, BinaryData.FromString(property.Value.GetRawText()));
+                additionalPropertiesDictionary.Add(property.Name, JsonSerializer.Deserialize<DataFactoryElement<string>>(property.Value.GetRawText()));
             }
             additionalProperties = additionalPropertiesDictionary;
             return new ValidationActivity(name, type, description.Value, Optional.ToNullable(state), Optional.ToNullable(onInactiveMarkAs), Optional.ToList(dependsOn), Optional.ToList(userProperties), additionalProperties, timeout.Value, sleep.Value, minimumSize.Value, childItems.Value, dataset);
diff --git a/src/AzureDataFactory.TestingFramework/Generated/Models/ValidationActivity.cs b/src/AzureDataFactory.TestingFramework/Generated/Models/ValidationActivity.cs
index 07eb9020..fb09afab 100644
--- a/src/AzureDataFactory.TestingFramework/Generated/Models/ValidationActivity.cs
+++ b/src/AzureDataFactory.TestingFramework/Generated/Models/ValidationActivity.cs
@@ -40,7 +40,7 @@ public ValidationActivity(string name, DatasetReference dataset) : base(name)
         /// <param name="minimumSize"> Can be used if dataset points to a file. The file must be greater than or equal in size to the value specified. Type: integer (or Expression with resultType integer). </param>
         /// <param name="childItems"> Can be used if dataset points to a folder. If set to true, the folder must have at least one file. If set to false, the folder must be empty. Type: boolean (or Expression with resultType boolean). </param>
         /// <param name="dataset"> Validation activity dataset reference. </param>
-        internal ValidationActivity(string name, string activityType, string description, PipelineActivityState? state, ActivityOnInactiveMarkAs? onInactiveMarkAs, IList<PipelineActivityDependency> dependsOn, IList<PipelineActivityUserProperty> userProperties, IDictionary<string, BinaryData> additionalProperties, DataFactoryElement<string> timeout, DataFactoryElement<int> sleep, DataFactoryElement<int> minimumSize, DataFactoryElement<bool> childItems, DatasetReference dataset) : base(name, activityType, description, state, onInactiveMarkAs, dependsOn, userProperties, additionalProperties)
+        internal ValidationActivity(string name, string activityType, string description, PipelineActivityState? state, ActivityOnInactiveMarkAs? onInactiveMarkAs, IList<PipelineActivityDependency> dependsOn, IList<PipelineActivityUserProperty> userProperties, IDictionary<string, DataFactoryElement<string>> additionalProperties, DataFactoryElement<string> timeout, DataFactoryElement<int> sleep, DataFactoryElement<int> minimumSize, DataFactoryElement<bool> childItems, DatasetReference dataset) : base(name, activityType, description, state, onInactiveMarkAs, dependsOn, userProperties, additionalProperties)
         {
             Timeout = timeout;
             Sleep = sleep;
diff --git a/src/AzureDataFactory.TestingFramework/Generated/Models/VerticaLinkedService.Serialization.cs b/src/AzureDataFactory.TestingFramework/Generated/Models/VerticaLinkedService.Serialization.cs
index 07a791a7..8e85fc22 100644
--- a/src/AzureDataFactory.TestingFramework/Generated/Models/VerticaLinkedService.Serialization.cs
+++ b/src/AzureDataFactory.TestingFramework/Generated/Models/VerticaLinkedService.Serialization.cs
@@ -102,8 +102,8 @@ internal static VerticaLinkedService DeserializeVerticaLinkedService(JsonElement
             Optional<DataFactoryElement<string>> connectionString = default;
             Optional<DataFactoryKeyVaultSecretReference> password = default;
             Optional<string> encryptedCredential = default;
-            IDictionary<string, BinaryData> additionalProperties = default;
-            Dictionary<string, BinaryData> additionalPropertiesDictionary = new Dictionary<string, BinaryData>();
+            IDictionary<string, DataFactoryElement<string>> additionalProperties = default;
+            Dictionary<string, DataFactoryElement<string>> additionalPropertiesDictionary = new Dictionary<string, DataFactoryElement<string>>();
             foreach (var property in element.EnumerateObject())
             {
                 if (property.NameEquals("type"u8))
@@ -195,7 +195,7 @@ internal static VerticaLinkedService DeserializeVerticaLinkedService(JsonElement
                     }
                     continue;
                 }
-                additionalPropertiesDictionary.Add(property.Name, BinaryData.FromString(property.Value.GetRawText()));
+                additionalPropertiesDictionary.Add(property.Name, JsonSerializer.Deserialize<DataFactoryElement<string>>(property.Value.GetRawText()));
             }
             additionalProperties = additionalPropertiesDictionary;
             return new VerticaLinkedService(type, connectVia.Value, description.Value, Optional.ToDictionary(parameters), Optional.ToList(annotations), additionalProperties, connectionString.Value, password, encryptedCredential.Value);
diff --git a/src/AzureDataFactory.TestingFramework/Generated/Models/VerticaLinkedService.cs b/src/AzureDataFactory.TestingFramework/Generated/Models/VerticaLinkedService.cs
index e6b762db..e0215b5a 100644
--- a/src/AzureDataFactory.TestingFramework/Generated/Models/VerticaLinkedService.cs
+++ b/src/AzureDataFactory.TestingFramework/Generated/Models/VerticaLinkedService.cs
@@ -28,7 +28,7 @@ public VerticaLinkedService()
         /// <param name="connectionString"> An ODBC connection string. Type: string, SecureString or AzureKeyVaultSecretReference. </param>
         /// <param name="password"> The Azure key vault secret reference of password in connection string. </param>
         /// <param name="encryptedCredential"> The encrypted credential used for authentication. Credentials are encrypted using the integration runtime credential manager. Type: string. </param>
-        internal VerticaLinkedService(string linkedServiceType, IntegrationRuntimeReference connectVia, string description, IDictionary<string, EntityParameterSpecification> parameters, IList<BinaryData> annotations, IDictionary<string, BinaryData> additionalProperties, DataFactoryElement<string> connectionString, DataFactoryKeyVaultSecretReference password, string encryptedCredential) : base(linkedServiceType, connectVia, description, parameters, annotations, additionalProperties)
+        internal VerticaLinkedService(string linkedServiceType, IntegrationRuntimeReference connectVia, string description, IDictionary<string, EntityParameterSpecification> parameters, IList<BinaryData> annotations, IDictionary<string, DataFactoryElement<string>> additionalProperties, DataFactoryElement<string> connectionString, DataFactoryKeyVaultSecretReference password, string encryptedCredential) : base(linkedServiceType, connectVia, description, parameters, annotations, additionalProperties)
         {
             ConnectionString = connectionString;
             Password = password;
diff --git a/src/AzureDataFactory.TestingFramework/Generated/Models/VerticaSource.Serialization.cs b/src/AzureDataFactory.TestingFramework/Generated/Models/VerticaSource.Serialization.cs
index 66f34c4c..a00f7e72 100644
--- a/src/AzureDataFactory.TestingFramework/Generated/Models/VerticaSource.Serialization.cs
+++ b/src/AzureDataFactory.TestingFramework/Generated/Models/VerticaSource.Serialization.cs
@@ -83,8 +83,8 @@ internal static VerticaSource DeserializeVerticaSource(JsonElement element)
             Optional<DataFactoryElement<string>> sourceRetryWait = default;
             Optional<DataFactoryElement<int>> maxConcurrentConnections = default;
             Optional<DataFactoryElement<bool>> disableMetricsCollection = default;
-            IDictionary<string, BinaryData> additionalProperties = default;
-            Dictionary<string, BinaryData> additionalPropertiesDictionary = new Dictionary<string, BinaryData>();
+            IDictionary<string, DataFactoryElement<string>> additionalProperties = default;
+            Dictionary<string, DataFactoryElement<string>> additionalPropertiesDictionary = new Dictionary<string, DataFactoryElement<string>>();
             foreach (var property in element.EnumerateObject())
             {
                 if (property.NameEquals("query"u8))
@@ -155,7 +155,7 @@ internal static VerticaSource DeserializeVerticaSource(JsonElement element)
                     disableMetricsCollection = JsonSerializer.Deserialize<DataFactoryElement<bool>>(property.Value.GetRawText());
                     continue;
                 }
-                additionalPropertiesDictionary.Add(property.Name, BinaryData.FromString(property.Value.GetRawText()));
+                additionalPropertiesDictionary.Add(property.Name, JsonSerializer.Deserialize<DataFactoryElement<string>>(property.Value.GetRawText()));
             }
             additionalProperties = additionalPropertiesDictionary;
             return new VerticaSource(type, sourceRetryCount.Value, sourceRetryWait.Value, maxConcurrentConnections.Value, disableMetricsCollection.Value, additionalProperties, queryTimeout.Value, additionalColumns.Value, query.Value);
diff --git a/src/AzureDataFactory.TestingFramework/Generated/Models/VerticaSource.cs b/src/AzureDataFactory.TestingFramework/Generated/Models/VerticaSource.cs
index 54d37c4d..bc5540a1 100644
--- a/src/AzureDataFactory.TestingFramework/Generated/Models/VerticaSource.cs
+++ b/src/AzureDataFactory.TestingFramework/Generated/Models/VerticaSource.cs
@@ -28,7 +28,7 @@ public VerticaSource()
         /// <param name="queryTimeout"> Query timeout. Type: string (or Expression with resultType string), pattern: ((\d+)\.)?(\d\d):(60|([0-5][0-9])):(60|([0-5][0-9])). </param>
         /// <param name="additionalColumns"> Specifies the additional columns to be added to source data. Type: array of objects(AdditionalColumns) (or Expression with resultType array of objects). </param>
         /// <param name="query"> A query to retrieve data from source. Type: string (or Expression with resultType string). </param>
-        internal VerticaSource(string copySourceType, DataFactoryElement<int> sourceRetryCount, DataFactoryElement<string> sourceRetryWait, DataFactoryElement<int> maxConcurrentConnections, DataFactoryElement<bool> disableMetricsCollection, IDictionary<string, BinaryData> additionalProperties, DataFactoryElement<string> queryTimeout, BinaryData additionalColumns, DataFactoryElement<string> query) : base(copySourceType, sourceRetryCount, sourceRetryWait, maxConcurrentConnections, disableMetricsCollection, additionalProperties, queryTimeout, additionalColumns)
+        internal VerticaSource(string copySourceType, DataFactoryElement<int> sourceRetryCount, DataFactoryElement<string> sourceRetryWait, DataFactoryElement<int> maxConcurrentConnections, DataFactoryElement<bool> disableMetricsCollection, IDictionary<string, DataFactoryElement<string>> additionalProperties, DataFactoryElement<string> queryTimeout, BinaryData additionalColumns, DataFactoryElement<string> query) : base(copySourceType, sourceRetryCount, sourceRetryWait, maxConcurrentConnections, disableMetricsCollection, additionalProperties, queryTimeout, additionalColumns)
         {
             Query = query;
             CopySourceType = copySourceType ?? "VerticaSource";
diff --git a/src/AzureDataFactory.TestingFramework/Generated/Models/VerticaTableDataset.Serialization.cs b/src/AzureDataFactory.TestingFramework/Generated/Models/VerticaTableDataset.Serialization.cs
index af7874bf..44327abe 100644
--- a/src/AzureDataFactory.TestingFramework/Generated/Models/VerticaTableDataset.Serialization.cs
+++ b/src/AzureDataFactory.TestingFramework/Generated/Models/VerticaTableDataset.Serialization.cs
@@ -120,8 +120,8 @@ internal static VerticaTableDataset DeserializeVerticaTableDataset(JsonElement e
             Optional<BinaryData> tableName = default;
             Optional<DataFactoryElement<string>> table = default;
             Optional<DataFactoryElement<string>> schema0 = default;
-            IDictionary<string, BinaryData> additionalProperties = default;
-            Dictionary<string, BinaryData> additionalPropertiesDictionary = new Dictionary<string, BinaryData>();
+            IDictionary<string, DataFactoryElement<string>> additionalProperties = default;
+            Dictionary<string, DataFactoryElement<string>> additionalPropertiesDictionary = new Dictionary<string, DataFactoryElement<string>>();
             foreach (var property in element.EnumerateObject())
             {
                 if (property.NameEquals("type"u8))
@@ -240,7 +240,7 @@ internal static VerticaTableDataset DeserializeVerticaTableDataset(JsonElement e
                     }
                     continue;
                 }
-                additionalPropertiesDictionary.Add(property.Name, BinaryData.FromString(property.Value.GetRawText()));
+                additionalPropertiesDictionary.Add(property.Name, JsonSerializer.Deserialize<DataFactoryElement<string>>(property.Value.GetRawText()));
             }
             additionalProperties = additionalPropertiesDictionary;
             return new VerticaTableDataset(type, description.Value, structure.Value, schema.Value, linkedServiceName, Optional.ToDictionary(parameters), Optional.ToList(annotations), folder.Value, additionalProperties, tableName.Value, table.Value, schema0.Value);
diff --git a/src/AzureDataFactory.TestingFramework/Generated/Models/VerticaTableDataset.cs b/src/AzureDataFactory.TestingFramework/Generated/Models/VerticaTableDataset.cs
index f43ff702..f0264be0 100644
--- a/src/AzureDataFactory.TestingFramework/Generated/Models/VerticaTableDataset.cs
+++ b/src/AzureDataFactory.TestingFramework/Generated/Models/VerticaTableDataset.cs
@@ -36,7 +36,7 @@ public VerticaTableDataset(DataFactoryLinkedServiceReference linkedServiceName)
         /// <param name="tableName"> This property will be retired. Please consider using schema + table properties instead. </param>
         /// <param name="table"> The table name of the Vertica. Type: string (or Expression with resultType string). </param>
         /// <param name="schemaTypePropertiesSchema"> The schema name of the Vertica. Type: string (or Expression with resultType string). </param>
-        internal VerticaTableDataset(string datasetType, string description, DataFactoryElement<IList<DatasetDataElement>> structure, DataFactoryElement<IList<DatasetSchemaDataElement>> schema, DataFactoryLinkedServiceReference linkedServiceName, IDictionary<string, EntityParameterSpecification> parameters, IList<BinaryData> annotations, DatasetFolder folder, IDictionary<string, BinaryData> additionalProperties, BinaryData tableName, DataFactoryElement<string> table, DataFactoryElement<string> schemaTypePropertiesSchema) : base(datasetType, description, structure, schema, linkedServiceName, parameters, annotations, folder, additionalProperties)
+        internal VerticaTableDataset(string datasetType, string description, DataFactoryElement<IList<DatasetDataElement>> structure, DataFactoryElement<IList<DatasetSchemaDataElement>> schema, DataFactoryLinkedServiceReference linkedServiceName, IDictionary<string, EntityParameterSpecification> parameters, IList<BinaryData> annotations, DatasetFolder folder, IDictionary<string, DataFactoryElement<string>> additionalProperties, BinaryData tableName, DataFactoryElement<string> table, DataFactoryElement<string> schemaTypePropertiesSchema) : base(datasetType, description, structure, schema, linkedServiceName, parameters, annotations, folder, additionalProperties)
         {
             TableName = tableName;
             Table = table;
diff --git a/src/AzureDataFactory.TestingFramework/Generated/Models/WaitActivity.Serialization.cs b/src/AzureDataFactory.TestingFramework/Generated/Models/WaitActivity.Serialization.cs
index f21bf727..37d10283 100644
--- a/src/AzureDataFactory.TestingFramework/Generated/Models/WaitActivity.Serialization.cs
+++ b/src/AzureDataFactory.TestingFramework/Generated/Models/WaitActivity.Serialization.cs
@@ -86,8 +86,8 @@ internal static WaitActivity DeserializeWaitActivity(JsonElement element)
             Optional<IList<PipelineActivityDependency>> dependsOn = default;
             Optional<IList<PipelineActivityUserProperty>> userProperties = default;
             DataFactoryElement<int> waitTimeInSeconds = default;
-            IDictionary<string, BinaryData> additionalProperties = default;
-            Dictionary<string, BinaryData> additionalPropertiesDictionary = new Dictionary<string, BinaryData>();
+            IDictionary<string, DataFactoryElement<string>> additionalProperties = default;
+            Dictionary<string, DataFactoryElement<string>> additionalPropertiesDictionary = new Dictionary<string, DataFactoryElement<string>>();
             foreach (var property in element.EnumerateObject())
             {
                 if (property.NameEquals("name"u8))
@@ -168,7 +168,7 @@ internal static WaitActivity DeserializeWaitActivity(JsonElement element)
                     }
                     continue;
                 }
-                additionalPropertiesDictionary.Add(property.Name, BinaryData.FromString(property.Value.GetRawText()));
+                additionalPropertiesDictionary.Add(property.Name, JsonSerializer.Deserialize<DataFactoryElement<string>>(property.Value.GetRawText()));
             }
             additionalProperties = additionalPropertiesDictionary;
             return new WaitActivity(name, type, description.Value, Optional.ToNullable(state), Optional.ToNullable(onInactiveMarkAs), Optional.ToList(dependsOn), Optional.ToList(userProperties), additionalProperties, waitTimeInSeconds);
diff --git a/src/AzureDataFactory.TestingFramework/Generated/Models/WaitActivity.cs b/src/AzureDataFactory.TestingFramework/Generated/Models/WaitActivity.cs
index f96bc4da..aedf8e5d 100644
--- a/src/AzureDataFactory.TestingFramework/Generated/Models/WaitActivity.cs
+++ b/src/AzureDataFactory.TestingFramework/Generated/Models/WaitActivity.cs
@@ -36,7 +36,7 @@ public WaitActivity(string name, DataFactoryElement<int> waitTimeInSeconds) : ba
         /// <param name="userProperties"> Activity user properties. </param>
         /// <param name="additionalProperties"> Additional Properties. </param>
         /// <param name="waitTimeInSeconds"> Duration in seconds. Type: integer (or Expression with resultType integer). </param>
-        internal WaitActivity(string name, string activityType, string description, PipelineActivityState? state, ActivityOnInactiveMarkAs? onInactiveMarkAs, IList<PipelineActivityDependency> dependsOn, IList<PipelineActivityUserProperty> userProperties, IDictionary<string, BinaryData> additionalProperties, DataFactoryElement<int> waitTimeInSeconds) : base(name, activityType, description, state, onInactiveMarkAs, dependsOn, userProperties, additionalProperties)
+        internal WaitActivity(string name, string activityType, string description, PipelineActivityState? state, ActivityOnInactiveMarkAs? onInactiveMarkAs, IList<PipelineActivityDependency> dependsOn, IList<PipelineActivityUserProperty> userProperties, IDictionary<string, DataFactoryElement<string>> additionalProperties, DataFactoryElement<int> waitTimeInSeconds) : base(name, activityType, description, state, onInactiveMarkAs, dependsOn, userProperties, additionalProperties)
         {
             WaitTimeInSeconds = waitTimeInSeconds;
             ActivityType = activityType ?? "Wait";
diff --git a/src/AzureDataFactory.TestingFramework/Generated/Models/WebActivity.Serialization.cs b/src/AzureDataFactory.TestingFramework/Generated/Models/WebActivity.Serialization.cs
index c9caf6c1..716ffe38 100644
--- a/src/AzureDataFactory.TestingFramework/Generated/Models/WebActivity.Serialization.cs
+++ b/src/AzureDataFactory.TestingFramework/Generated/Models/WebActivity.Serialization.cs
@@ -153,8 +153,8 @@ internal static WebActivity DeserializeWebActivity(JsonElement element)
             Optional<IList<DatasetReference>> datasets = default;
             Optional<IList<DataFactoryLinkedServiceReference>> linkedServices = default;
             Optional<IntegrationRuntimeReference> connectVia = default;
-            IDictionary<string, BinaryData> additionalProperties = default;
-            Dictionary<string, BinaryData> additionalPropertiesDictionary = new Dictionary<string, BinaryData>();
+            IDictionary<string, DataFactoryElement<string>> additionalProperties = default;
+            Dictionary<string, DataFactoryElement<string>> additionalPropertiesDictionary = new Dictionary<string, DataFactoryElement<string>>();
             foreach (var property in element.EnumerateObject())
             {
                 if (property.NameEquals("linkedServiceName"u8))
@@ -331,7 +331,7 @@ internal static WebActivity DeserializeWebActivity(JsonElement element)
                     }
                     continue;
                 }
-                additionalPropertiesDictionary.Add(property.Name, BinaryData.FromString(property.Value.GetRawText()));
+                additionalPropertiesDictionary.Add(property.Name, JsonSerializer.Deserialize<DataFactoryElement<string>>(property.Value.GetRawText()));
             }
             additionalProperties = additionalPropertiesDictionary;
             return new WebActivity(name, type, description.Value, Optional.ToNullable(state), Optional.ToNullable(onInactiveMarkAs), Optional.ToList(dependsOn), Optional.ToList(userProperties), additionalProperties, linkedServiceName, policy.Value, method, url, headers.Value, body.Value, authentication.Value, Optional.ToNullable(disableCertValidation), Optional.ToList(datasets), Optional.ToList(linkedServices), connectVia.Value);
diff --git a/src/AzureDataFactory.TestingFramework/Generated/Models/WebActivity.cs b/src/AzureDataFactory.TestingFramework/Generated/Models/WebActivity.cs
index 6daa56b5..f0a118b4 100644
--- a/src/AzureDataFactory.TestingFramework/Generated/Models/WebActivity.cs
+++ b/src/AzureDataFactory.TestingFramework/Generated/Models/WebActivity.cs
@@ -50,7 +50,7 @@ public WebActivity(string name, WebActivityMethod method, DataFactoryElement<str
         /// <param name="datasets"> List of datasets passed to web endpoint. </param>
         /// <param name="linkedServices"> List of linked services passed to web endpoint. </param>
         /// <param name="connectVia"> The integration runtime reference. </param>
-        internal WebActivity(string name, string activityType, string description, PipelineActivityState? state, ActivityOnInactiveMarkAs? onInactiveMarkAs, IList<PipelineActivityDependency> dependsOn, IList<PipelineActivityUserProperty> userProperties, IDictionary<string, BinaryData> additionalProperties, DataFactoryLinkedServiceReference linkedServiceName, PipelineActivityPolicy policy, WebActivityMethod method, DataFactoryElement<string> uri, Dictionary<string, DataFactoryElement<string>> headers, DataFactoryElement<string> body, WebActivityAuthentication authentication, bool? disableCertValidation, IList<DatasetReference> datasets, IList<DataFactoryLinkedServiceReference> linkedServices, IntegrationRuntimeReference connectVia) : base(name, activityType, description, state, onInactiveMarkAs, dependsOn, userProperties, additionalProperties, linkedServiceName, policy)
+        internal WebActivity(string name, string activityType, string description, PipelineActivityState? state, ActivityOnInactiveMarkAs? onInactiveMarkAs, IList<PipelineActivityDependency> dependsOn, IList<PipelineActivityUserProperty> userProperties, IDictionary<string, DataFactoryElement<string>> additionalProperties, DataFactoryLinkedServiceReference linkedServiceName, PipelineActivityPolicy policy, WebActivityMethod method, DataFactoryElement<string> uri, Dictionary<string, DataFactoryElement<string>> headers, DataFactoryElement<string> body, WebActivityAuthentication authentication, bool? disableCertValidation, IList<DatasetReference> datasets, IList<DataFactoryLinkedServiceReference> linkedServices, IntegrationRuntimeReference connectVia) : base(name, activityType, description, state, onInactiveMarkAs, dependsOn, userProperties, additionalProperties, linkedServiceName, policy)
         {
             Method = method;
             Uri = uri;
diff --git a/src/AzureDataFactory.TestingFramework/Generated/Models/WebHookActivity.Serialization.cs b/src/AzureDataFactory.TestingFramework/Generated/Models/WebHookActivity.Serialization.cs
index 11f82fbe..45a97017 100644
--- a/src/AzureDataFactory.TestingFramework/Generated/Models/WebHookActivity.Serialization.cs
+++ b/src/AzureDataFactory.TestingFramework/Generated/Models/WebHookActivity.Serialization.cs
@@ -119,8 +119,8 @@ internal static WebHookActivity DeserializeWebHookActivity(JsonElement element)
             Optional<DataFactoryElement<string>> body = default;
             Optional<WebActivityAuthentication> authentication = default;
             Optional<DataFactoryElement<bool>> reportStatusOnCallBack = default;
-            IDictionary<string, BinaryData> additionalProperties = default;
-            Dictionary<string, BinaryData> additionalPropertiesDictionary = new Dictionary<string, BinaryData>();
+            IDictionary<string, DataFactoryElement<string>> additionalProperties = default;
+            Dictionary<string, DataFactoryElement<string>> additionalPropertiesDictionary = new Dictionary<string, DataFactoryElement<string>>();
             foreach (var property in element.EnumerateObject())
             {
                 if (property.NameEquals("name"u8))
@@ -247,7 +247,7 @@ internal static WebHookActivity DeserializeWebHookActivity(JsonElement element)
                     }
                     continue;
                 }
-                additionalPropertiesDictionary.Add(property.Name, BinaryData.FromString(property.Value.GetRawText()));
+                additionalPropertiesDictionary.Add(property.Name, JsonSerializer.Deserialize<DataFactoryElement<string>>(property.Value.GetRawText()));
             }
             additionalProperties = additionalPropertiesDictionary;
             return new WebHookActivity(name, type, description.Value, Optional.ToNullable(state), Optional.ToNullable(onInactiveMarkAs), Optional.ToList(dependsOn), Optional.ToList(userProperties), additionalProperties, method, url, timeout.Value, headers.Value, body.Value, authentication.Value, reportStatusOnCallBack.Value);
diff --git a/src/AzureDataFactory.TestingFramework/Generated/Models/WebHookActivity.cs b/src/AzureDataFactory.TestingFramework/Generated/Models/WebHookActivity.cs
index 860d66af..b06c876d 100644
--- a/src/AzureDataFactory.TestingFramework/Generated/Models/WebHookActivity.cs
+++ b/src/AzureDataFactory.TestingFramework/Generated/Models/WebHookActivity.cs
@@ -44,7 +44,7 @@ public WebHookActivity(string name, WebHookActivityMethod method, DataFactoryEle
         /// <param name="body"> Represents the payload that will be sent to the endpoint. Required for POST/PUT method, not allowed for GET method Type: string (or Expression with resultType string). </param>
         /// <param name="authentication"> Authentication method used for calling the endpoint. </param>
         /// <param name="reportStatusOnCallBack"> When set to true, statusCode, output and error in callback request body will be consumed by activity. The activity can be marked as failed by setting statusCode &gt;= 400 in callback request. Default is false. Type: boolean (or Expression with resultType boolean). </param>
-        internal WebHookActivity(string name, string activityType, string description, PipelineActivityState? state, ActivityOnInactiveMarkAs? onInactiveMarkAs, IList<PipelineActivityDependency> dependsOn, IList<PipelineActivityUserProperty> userProperties, IDictionary<string, BinaryData> additionalProperties, WebHookActivityMethod method, DataFactoryElement<string> uri, string timeout, Dictionary<string, DataFactoryElement<string>> headers, DataFactoryElement<string> body, WebActivityAuthentication authentication, DataFactoryElement<bool> reportStatusOnCallBack) : base(name, activityType, description, state, onInactiveMarkAs, dependsOn, userProperties, additionalProperties)
+        internal WebHookActivity(string name, string activityType, string description, PipelineActivityState? state, ActivityOnInactiveMarkAs? onInactiveMarkAs, IList<PipelineActivityDependency> dependsOn, IList<PipelineActivityUserProperty> userProperties, IDictionary<string, DataFactoryElement<string>> additionalProperties, WebHookActivityMethod method, DataFactoryElement<string> uri, string timeout, Dictionary<string, DataFactoryElement<string>> headers, DataFactoryElement<string> body, WebActivityAuthentication authentication, DataFactoryElement<bool> reportStatusOnCallBack) : base(name, activityType, description, state, onInactiveMarkAs, dependsOn, userProperties, additionalProperties)
         {
             Method = method;
             Uri = uri;
diff --git a/src/AzureDataFactory.TestingFramework/Generated/Models/WebLinkedService.Serialization.cs b/src/AzureDataFactory.TestingFramework/Generated/Models/WebLinkedService.Serialization.cs
index 4a8e73ab..51734132 100644
--- a/src/AzureDataFactory.TestingFramework/Generated/Models/WebLinkedService.Serialization.cs
+++ b/src/AzureDataFactory.TestingFramework/Generated/Models/WebLinkedService.Serialization.cs
@@ -7,6 +7,7 @@
 
 using System.Text.Json;
 using Azure.Core;
+using Azure.Core.Expressions.DataFactory;
 
 namespace AzureDataFactory.TestingFramework.Models
 {
@@ -83,8 +84,8 @@ internal static WebLinkedService DeserializeWebLinkedService(JsonElement element
             Optional<string> description = default;
             Optional<IDictionary<string, EntityParameterSpecification>> parameters = default;
             Optional<IList<BinaryData>> annotations = default;
-            IDictionary<string, BinaryData> additionalProperties = default;
-            Dictionary<string, BinaryData> additionalPropertiesDictionary = new Dictionary<string, BinaryData>();
+            IDictionary<string, DataFactoryElement<string>> additionalProperties = default;
+            Dictionary<string, DataFactoryElement<string>> additionalPropertiesDictionary = new Dictionary<string, DataFactoryElement<string>>();
             foreach (var property in element.EnumerateObject())
             {
                 if (property.NameEquals("typeProperties"u8))
@@ -146,7 +147,7 @@ internal static WebLinkedService DeserializeWebLinkedService(JsonElement element
                     annotations = array;
                     continue;
                 }
-                additionalPropertiesDictionary.Add(property.Name, BinaryData.FromString(property.Value.GetRawText()));
+                additionalPropertiesDictionary.Add(property.Name, JsonSerializer.Deserialize<DataFactoryElement<string>>(property.Value.GetRawText()));
             }
             additionalProperties = additionalPropertiesDictionary;
             return new WebLinkedService(type, connectVia.Value, description.Value, Optional.ToDictionary(parameters), Optional.ToList(annotations), additionalProperties, typeProperties);
diff --git a/src/AzureDataFactory.TestingFramework/Generated/Models/WebLinkedService.cs b/src/AzureDataFactory.TestingFramework/Generated/Models/WebLinkedService.cs
index d6454e39..e1c12f3c 100644
--- a/src/AzureDataFactory.TestingFramework/Generated/Models/WebLinkedService.cs
+++ b/src/AzureDataFactory.TestingFramework/Generated/Models/WebLinkedService.cs
@@ -6,6 +6,7 @@
 #nullable disable
 
 using Azure.Core;
+using Azure.Core.Expressions.DataFactory;
 
 namespace AzureDataFactory.TestingFramework.Models
 {
@@ -39,7 +40,7 @@ public WebLinkedService(WebLinkedServiceTypeProperties typeProperties)
         /// Please note <see cref="WebLinkedServiceTypeProperties"/> is the base class. According to the scenario, a derived class of the base class might need to be assigned here, or this property needs to be casted to one of the possible derived classes.
         /// The available derived classes include <see cref="WebAnonymousAuthentication"/>, <see cref="WebBasicAuthentication"/> and <see cref="WebClientCertificateAuthentication"/>.
         /// </param>
-        internal WebLinkedService(string linkedServiceType, IntegrationRuntimeReference connectVia, string description, IDictionary<string, EntityParameterSpecification> parameters, IList<BinaryData> annotations, IDictionary<string, BinaryData> additionalProperties, WebLinkedServiceTypeProperties typeProperties) : base(linkedServiceType, connectVia, description, parameters, annotations, additionalProperties)
+        internal WebLinkedService(string linkedServiceType, IntegrationRuntimeReference connectVia, string description, IDictionary<string, EntityParameterSpecification> parameters, IList<BinaryData> annotations, IDictionary<string, DataFactoryElement<string>> additionalProperties, WebLinkedServiceTypeProperties typeProperties) : base(linkedServiceType, connectVia, description, parameters, annotations, additionalProperties)
         {
             TypeProperties = typeProperties;
             LinkedServiceType = linkedServiceType ?? "Web";
diff --git a/src/AzureDataFactory.TestingFramework/Generated/Models/WebSource.Serialization.cs b/src/AzureDataFactory.TestingFramework/Generated/Models/WebSource.Serialization.cs
index 524afd28..da2efcf1 100644
--- a/src/AzureDataFactory.TestingFramework/Generated/Models/WebSource.Serialization.cs
+++ b/src/AzureDataFactory.TestingFramework/Generated/Models/WebSource.Serialization.cs
@@ -71,8 +71,8 @@ internal static WebSource DeserializeWebSource(JsonElement element)
             Optional<DataFactoryElement<string>> sourceRetryWait = default;
             Optional<DataFactoryElement<int>> maxConcurrentConnections = default;
             Optional<DataFactoryElement<bool>> disableMetricsCollection = default;
-            IDictionary<string, BinaryData> additionalProperties = default;
-            Dictionary<string, BinaryData> additionalPropertiesDictionary = new Dictionary<string, BinaryData>();
+            IDictionary<string, DataFactoryElement<string>> additionalProperties = default;
+            Dictionary<string, DataFactoryElement<string>> additionalPropertiesDictionary = new Dictionary<string, DataFactoryElement<string>>();
             foreach (var property in element.EnumerateObject())
             {
                 if (property.NameEquals("additionalColumns"u8))
@@ -125,7 +125,7 @@ internal static WebSource DeserializeWebSource(JsonElement element)
                     disableMetricsCollection = JsonSerializer.Deserialize<DataFactoryElement<bool>>(property.Value.GetRawText());
                     continue;
                 }
-                additionalPropertiesDictionary.Add(property.Name, BinaryData.FromString(property.Value.GetRawText()));
+                additionalPropertiesDictionary.Add(property.Name, JsonSerializer.Deserialize<DataFactoryElement<string>>(property.Value.GetRawText()));
             }
             additionalProperties = additionalPropertiesDictionary;
             return new WebSource(type, sourceRetryCount.Value, sourceRetryWait.Value, maxConcurrentConnections.Value, disableMetricsCollection.Value, additionalProperties, additionalColumns.Value);
diff --git a/src/AzureDataFactory.TestingFramework/Generated/Models/WebSource.cs b/src/AzureDataFactory.TestingFramework/Generated/Models/WebSource.cs
index 67eff645..b7562c05 100644
--- a/src/AzureDataFactory.TestingFramework/Generated/Models/WebSource.cs
+++ b/src/AzureDataFactory.TestingFramework/Generated/Models/WebSource.cs
@@ -26,7 +26,7 @@ public WebSource()
         /// <param name="disableMetricsCollection"> If true, disable data store metrics collection. Default is false. Type: boolean (or Expression with resultType boolean). </param>
         /// <param name="additionalProperties"> Additional Properties. </param>
         /// <param name="additionalColumns"> Specifies the additional columns to be added to source data. Type: array of objects(AdditionalColumns) (or Expression with resultType array of objects). </param>
-        internal WebSource(string copySourceType, DataFactoryElement<int> sourceRetryCount, DataFactoryElement<string> sourceRetryWait, DataFactoryElement<int> maxConcurrentConnections, DataFactoryElement<bool> disableMetricsCollection, IDictionary<string, BinaryData> additionalProperties, BinaryData additionalColumns) : base(copySourceType, sourceRetryCount, sourceRetryWait, maxConcurrentConnections, disableMetricsCollection, additionalProperties)
+        internal WebSource(string copySourceType, DataFactoryElement<int> sourceRetryCount, DataFactoryElement<string> sourceRetryWait, DataFactoryElement<int> maxConcurrentConnections, DataFactoryElement<bool> disableMetricsCollection, IDictionary<string, DataFactoryElement<string>> additionalProperties, BinaryData additionalColumns) : base(copySourceType, sourceRetryCount, sourceRetryWait, maxConcurrentConnections, disableMetricsCollection, additionalProperties)
         {
             AdditionalColumns = additionalColumns;
             CopySourceType = copySourceType ?? "WebSource";
diff --git a/src/AzureDataFactory.TestingFramework/Generated/Models/WebTableDataset.Serialization.cs b/src/AzureDataFactory.TestingFramework/Generated/Models/WebTableDataset.Serialization.cs
index 7d5d3271..3d63574e 100644
--- a/src/AzureDataFactory.TestingFramework/Generated/Models/WebTableDataset.Serialization.cs
+++ b/src/AzureDataFactory.TestingFramework/Generated/Models/WebTableDataset.Serialization.cs
@@ -107,8 +107,8 @@ internal static WebTableDataset DeserializeWebTableDataset(JsonElement element)
             Optional<DatasetFolder> folder = default;
             DataFactoryElement<int> index = default;
             Optional<DataFactoryElement<string>> path = default;
-            IDictionary<string, BinaryData> additionalProperties = default;
-            Dictionary<string, BinaryData> additionalPropertiesDictionary = new Dictionary<string, BinaryData>();
+            IDictionary<string, DataFactoryElement<string>> additionalProperties = default;
+            Dictionary<string, DataFactoryElement<string>> additionalPropertiesDictionary = new Dictionary<string, DataFactoryElement<string>>();
             foreach (var property in element.EnumerateObject())
             {
                 if (property.NameEquals("type"u8))
@@ -214,7 +214,7 @@ internal static WebTableDataset DeserializeWebTableDataset(JsonElement element)
                     }
                     continue;
                 }
-                additionalPropertiesDictionary.Add(property.Name, BinaryData.FromString(property.Value.GetRawText()));
+                additionalPropertiesDictionary.Add(property.Name, JsonSerializer.Deserialize<DataFactoryElement<string>>(property.Value.GetRawText()));
             }
             additionalProperties = additionalPropertiesDictionary;
             return new WebTableDataset(type, description.Value, structure.Value, schema.Value, linkedServiceName, Optional.ToDictionary(parameters), Optional.ToList(annotations), folder.Value, additionalProperties, index, path.Value);
diff --git a/src/AzureDataFactory.TestingFramework/Generated/Models/WebTableDataset.cs b/src/AzureDataFactory.TestingFramework/Generated/Models/WebTableDataset.cs
index f6912f80..9e9faeec 100644
--- a/src/AzureDataFactory.TestingFramework/Generated/Models/WebTableDataset.cs
+++ b/src/AzureDataFactory.TestingFramework/Generated/Models/WebTableDataset.cs
@@ -38,7 +38,7 @@ public WebTableDataset(DataFactoryLinkedServiceReference linkedServiceName, Data
         /// <param name="additionalProperties"> Additional Properties. </param>
         /// <param name="index"> The zero-based index of the table in the web page. Type: integer (or Expression with resultType integer), minimum: 0. </param>
         /// <param name="path"> The relative URL to the web page from the linked service URL. Type: string (or Expression with resultType string). </param>
-        internal WebTableDataset(string datasetType, string description, DataFactoryElement<IList<DatasetDataElement>> structure, DataFactoryElement<IList<DatasetSchemaDataElement>> schema, DataFactoryLinkedServiceReference linkedServiceName, IDictionary<string, EntityParameterSpecification> parameters, IList<BinaryData> annotations, DatasetFolder folder, IDictionary<string, BinaryData> additionalProperties, DataFactoryElement<int> index, DataFactoryElement<string> path) : base(datasetType, description, structure, schema, linkedServiceName, parameters, annotations, folder, additionalProperties)
+        internal WebTableDataset(string datasetType, string description, DataFactoryElement<IList<DatasetDataElement>> structure, DataFactoryElement<IList<DatasetSchemaDataElement>> schema, DataFactoryLinkedServiceReference linkedServiceName, IDictionary<string, EntityParameterSpecification> parameters, IList<BinaryData> annotations, DatasetFolder folder, IDictionary<string, DataFactoryElement<string>> additionalProperties, DataFactoryElement<int> index, DataFactoryElement<string> path) : base(datasetType, description, structure, schema, linkedServiceName, parameters, annotations, folder, additionalProperties)
         {
             Index = index;
             Path = path;
diff --git a/src/AzureDataFactory.TestingFramework/Generated/Models/XeroLinkedService.Serialization.cs b/src/AzureDataFactory.TestingFramework/Generated/Models/XeroLinkedService.Serialization.cs
index be41e2f7..8b00e280 100644
--- a/src/AzureDataFactory.TestingFramework/Generated/Models/XeroLinkedService.Serialization.cs
+++ b/src/AzureDataFactory.TestingFramework/Generated/Models/XeroLinkedService.Serialization.cs
@@ -136,8 +136,8 @@ internal static XeroLinkedService DeserializeXeroLinkedService(JsonElement eleme
             Optional<DataFactoryElement<bool>> useHostVerification = default;
             Optional<DataFactoryElement<bool>> usePeerVerification = default;
             Optional<string> encryptedCredential = default;
-            IDictionary<string, BinaryData> additionalProperties = default;
-            Dictionary<string, BinaryData> additionalPropertiesDictionary = new Dictionary<string, BinaryData>();
+            IDictionary<string, DataFactoryElement<string>> additionalProperties = default;
+            Dictionary<string, DataFactoryElement<string>> additionalPropertiesDictionary = new Dictionary<string, DataFactoryElement<string>>();
             foreach (var property in element.EnumerateObject())
             {
                 if (property.NameEquals("type"u8))
@@ -274,7 +274,7 @@ internal static XeroLinkedService DeserializeXeroLinkedService(JsonElement eleme
                     }
                     continue;
                 }
-                additionalPropertiesDictionary.Add(property.Name, BinaryData.FromString(property.Value.GetRawText()));
+                additionalPropertiesDictionary.Add(property.Name, JsonSerializer.Deserialize<DataFactoryElement<string>>(property.Value.GetRawText()));
             }
             additionalProperties = additionalPropertiesDictionary;
             return new XeroLinkedService(type, connectVia.Value, description.Value, Optional.ToDictionary(parameters), Optional.ToList(annotations), additionalProperties, connectionProperties.Value, host.Value, consumerKey, privateKey, useEncryptedEndpoints.Value, useHostVerification.Value, usePeerVerification.Value, encryptedCredential.Value);
diff --git a/src/AzureDataFactory.TestingFramework/Generated/Models/XeroLinkedService.cs b/src/AzureDataFactory.TestingFramework/Generated/Models/XeroLinkedService.cs
index 7d694f55..02c7bb49 100644
--- a/src/AzureDataFactory.TestingFramework/Generated/Models/XeroLinkedService.cs
+++ b/src/AzureDataFactory.TestingFramework/Generated/Models/XeroLinkedService.cs
@@ -36,7 +36,7 @@ public XeroLinkedService()
         /// <param name="useHostVerification"> Specifies whether to require the host name in the server's certificate to match the host name of the server when connecting over SSL. The default value is true. </param>
         /// <param name="usePeerVerification"> Specifies whether to verify the identity of the server when connecting over SSL. The default value is true. </param>
         /// <param name="encryptedCredential"> The encrypted credential used for authentication. Credentials are encrypted using the integration runtime credential manager. Type: string. </param>
-        internal XeroLinkedService(string linkedServiceType, IntegrationRuntimeReference connectVia, string description, IDictionary<string, EntityParameterSpecification> parameters, IList<BinaryData> annotations, IDictionary<string, BinaryData> additionalProperties, BinaryData connectionProperties, DataFactoryElement<string> host, DataFactorySecretBaseDefinition consumerKey, DataFactorySecretBaseDefinition privateKey, DataFactoryElement<bool> useEncryptedEndpoints, DataFactoryElement<bool> useHostVerification, DataFactoryElement<bool> usePeerVerification, string encryptedCredential) : base(linkedServiceType, connectVia, description, parameters, annotations, additionalProperties)
+        internal XeroLinkedService(string linkedServiceType, IntegrationRuntimeReference connectVia, string description, IDictionary<string, EntityParameterSpecification> parameters, IList<BinaryData> annotations, IDictionary<string, DataFactoryElement<string>> additionalProperties, BinaryData connectionProperties, DataFactoryElement<string> host, DataFactorySecretBaseDefinition consumerKey, DataFactorySecretBaseDefinition privateKey, DataFactoryElement<bool> useEncryptedEndpoints, DataFactoryElement<bool> useHostVerification, DataFactoryElement<bool> usePeerVerification, string encryptedCredential) : base(linkedServiceType, connectVia, description, parameters, annotations, additionalProperties)
         {
             ConnectionProperties = connectionProperties;
             Host = host;
diff --git a/src/AzureDataFactory.TestingFramework/Generated/Models/XeroObjectDataset.Serialization.cs b/src/AzureDataFactory.TestingFramework/Generated/Models/XeroObjectDataset.Serialization.cs
index b98aa9e0..621d42a1 100644
--- a/src/AzureDataFactory.TestingFramework/Generated/Models/XeroObjectDataset.Serialization.cs
+++ b/src/AzureDataFactory.TestingFramework/Generated/Models/XeroObjectDataset.Serialization.cs
@@ -104,8 +104,8 @@ internal static XeroObjectDataset DeserializeXeroObjectDataset(JsonElement eleme
             Optional<IList<BinaryData>> annotations = default;
             Optional<DatasetFolder> folder = default;
             Optional<DataFactoryElement<string>> tableName = default;
-            IDictionary<string, BinaryData> additionalProperties = default;
-            Dictionary<string, BinaryData> additionalPropertiesDictionary = new Dictionary<string, BinaryData>();
+            IDictionary<string, DataFactoryElement<string>> additionalProperties = default;
+            Dictionary<string, DataFactoryElement<string>> additionalPropertiesDictionary = new Dictionary<string, DataFactoryElement<string>>();
             foreach (var property in element.EnumerateObject())
             {
                 if (property.NameEquals("type"u8))
@@ -206,7 +206,7 @@ internal static XeroObjectDataset DeserializeXeroObjectDataset(JsonElement eleme
                     }
                     continue;
                 }
-                additionalPropertiesDictionary.Add(property.Name, BinaryData.FromString(property.Value.GetRawText()));
+                additionalPropertiesDictionary.Add(property.Name, JsonSerializer.Deserialize<DataFactoryElement<string>>(property.Value.GetRawText()));
             }
             additionalProperties = additionalPropertiesDictionary;
             return new XeroObjectDataset(type, description.Value, structure.Value, schema.Value, linkedServiceName, Optional.ToDictionary(parameters), Optional.ToList(annotations), folder.Value, additionalProperties, tableName.Value);
diff --git a/src/AzureDataFactory.TestingFramework/Generated/Models/XeroObjectDataset.cs b/src/AzureDataFactory.TestingFramework/Generated/Models/XeroObjectDataset.cs
index 85d494fd..e3c96f45 100644
--- a/src/AzureDataFactory.TestingFramework/Generated/Models/XeroObjectDataset.cs
+++ b/src/AzureDataFactory.TestingFramework/Generated/Models/XeroObjectDataset.cs
@@ -34,7 +34,7 @@ public XeroObjectDataset(DataFactoryLinkedServiceReference linkedServiceName) :
         /// <param name="folder"> The folder that this Dataset is in. If not specified, Dataset will appear at the root level. </param>
         /// <param name="additionalProperties"> Additional Properties. </param>
         /// <param name="tableName"> The table name. Type: string (or Expression with resultType string). </param>
-        internal XeroObjectDataset(string datasetType, string description, DataFactoryElement<IList<DatasetDataElement>> structure, DataFactoryElement<IList<DatasetSchemaDataElement>> schema, DataFactoryLinkedServiceReference linkedServiceName, IDictionary<string, EntityParameterSpecification> parameters, IList<BinaryData> annotations, DatasetFolder folder, IDictionary<string, BinaryData> additionalProperties, DataFactoryElement<string> tableName) : base(datasetType, description, structure, schema, linkedServiceName, parameters, annotations, folder, additionalProperties)
+        internal XeroObjectDataset(string datasetType, string description, DataFactoryElement<IList<DatasetDataElement>> structure, DataFactoryElement<IList<DatasetSchemaDataElement>> schema, DataFactoryLinkedServiceReference linkedServiceName, IDictionary<string, EntityParameterSpecification> parameters, IList<BinaryData> annotations, DatasetFolder folder, IDictionary<string, DataFactoryElement<string>> additionalProperties, DataFactoryElement<string> tableName) : base(datasetType, description, structure, schema, linkedServiceName, parameters, annotations, folder, additionalProperties)
         {
             TableName = tableName;
             DatasetType = datasetType ?? "XeroObject";
diff --git a/src/AzureDataFactory.TestingFramework/Generated/Models/XeroSource.Serialization.cs b/src/AzureDataFactory.TestingFramework/Generated/Models/XeroSource.Serialization.cs
index c36c34d5..c25cb249 100644
--- a/src/AzureDataFactory.TestingFramework/Generated/Models/XeroSource.Serialization.cs
+++ b/src/AzureDataFactory.TestingFramework/Generated/Models/XeroSource.Serialization.cs
@@ -83,8 +83,8 @@ internal static XeroSource DeserializeXeroSource(JsonElement element)
             Optional<DataFactoryElement<string>> sourceRetryWait = default;
             Optional<DataFactoryElement<int>> maxConcurrentConnections = default;
             Optional<DataFactoryElement<bool>> disableMetricsCollection = default;
-            IDictionary<string, BinaryData> additionalProperties = default;
-            Dictionary<string, BinaryData> additionalPropertiesDictionary = new Dictionary<string, BinaryData>();
+            IDictionary<string, DataFactoryElement<string>> additionalProperties = default;
+            Dictionary<string, DataFactoryElement<string>> additionalPropertiesDictionary = new Dictionary<string, DataFactoryElement<string>>();
             foreach (var property in element.EnumerateObject())
             {
                 if (property.NameEquals("query"u8))
@@ -155,7 +155,7 @@ internal static XeroSource DeserializeXeroSource(JsonElement element)
                     disableMetricsCollection = JsonSerializer.Deserialize<DataFactoryElement<bool>>(property.Value.GetRawText());
                     continue;
                 }
-                additionalPropertiesDictionary.Add(property.Name, BinaryData.FromString(property.Value.GetRawText()));
+                additionalPropertiesDictionary.Add(property.Name, JsonSerializer.Deserialize<DataFactoryElement<string>>(property.Value.GetRawText()));
             }
             additionalProperties = additionalPropertiesDictionary;
             return new XeroSource(type, sourceRetryCount.Value, sourceRetryWait.Value, maxConcurrentConnections.Value, disableMetricsCollection.Value, additionalProperties, queryTimeout.Value, additionalColumns.Value, query.Value);
diff --git a/src/AzureDataFactory.TestingFramework/Generated/Models/XeroSource.cs b/src/AzureDataFactory.TestingFramework/Generated/Models/XeroSource.cs
index c0f972b8..27c6bbb0 100644
--- a/src/AzureDataFactory.TestingFramework/Generated/Models/XeroSource.cs
+++ b/src/AzureDataFactory.TestingFramework/Generated/Models/XeroSource.cs
@@ -28,7 +28,7 @@ public XeroSource()
         /// <param name="queryTimeout"> Query timeout. Type: string (or Expression with resultType string), pattern: ((\d+)\.)?(\d\d):(60|([0-5][0-9])):(60|([0-5][0-9])). </param>
         /// <param name="additionalColumns"> Specifies the additional columns to be added to source data. Type: array of objects(AdditionalColumns) (or Expression with resultType array of objects). </param>
         /// <param name="query"> A query to retrieve data from source. Type: string (or Expression with resultType string). </param>
-        internal XeroSource(string copySourceType, DataFactoryElement<int> sourceRetryCount, DataFactoryElement<string> sourceRetryWait, DataFactoryElement<int> maxConcurrentConnections, DataFactoryElement<bool> disableMetricsCollection, IDictionary<string, BinaryData> additionalProperties, DataFactoryElement<string> queryTimeout, BinaryData additionalColumns, DataFactoryElement<string> query) : base(copySourceType, sourceRetryCount, sourceRetryWait, maxConcurrentConnections, disableMetricsCollection, additionalProperties, queryTimeout, additionalColumns)
+        internal XeroSource(string copySourceType, DataFactoryElement<int> sourceRetryCount, DataFactoryElement<string> sourceRetryWait, DataFactoryElement<int> maxConcurrentConnections, DataFactoryElement<bool> disableMetricsCollection, IDictionary<string, DataFactoryElement<string>> additionalProperties, DataFactoryElement<string> queryTimeout, BinaryData additionalColumns, DataFactoryElement<string> query) : base(copySourceType, sourceRetryCount, sourceRetryWait, maxConcurrentConnections, disableMetricsCollection, additionalProperties, queryTimeout, additionalColumns)
         {
             Query = query;
             CopySourceType = copySourceType ?? "XeroSource";
diff --git a/src/AzureDataFactory.TestingFramework/Generated/Models/XmlDataset.Serialization.cs b/src/AzureDataFactory.TestingFramework/Generated/Models/XmlDataset.Serialization.cs
index 64530afb..b51c8f0a 100644
--- a/src/AzureDataFactory.TestingFramework/Generated/Models/XmlDataset.Serialization.cs
+++ b/src/AzureDataFactory.TestingFramework/Generated/Models/XmlDataset.Serialization.cs
@@ -122,8 +122,8 @@ internal static XmlDataset DeserializeXmlDataset(JsonElement element)
             Optional<DataFactoryElement<string>> encodingName = default;
             Optional<DataFactoryElement<string>> nullValue = default;
             Optional<DatasetCompression> compression = default;
-            IDictionary<string, BinaryData> additionalProperties = default;
-            Dictionary<string, BinaryData> additionalPropertiesDictionary = new Dictionary<string, BinaryData>();
+            IDictionary<string, DataFactoryElement<string>> additionalProperties = default;
+            Dictionary<string, DataFactoryElement<string>> additionalPropertiesDictionary = new Dictionary<string, DataFactoryElement<string>>();
             foreach (var property in element.EnumerateObject())
             {
                 if (property.NameEquals("type"u8))
@@ -251,7 +251,7 @@ internal static XmlDataset DeserializeXmlDataset(JsonElement element)
                     }
                     continue;
                 }
-                additionalPropertiesDictionary.Add(property.Name, BinaryData.FromString(property.Value.GetRawText()));
+                additionalPropertiesDictionary.Add(property.Name, JsonSerializer.Deserialize<DataFactoryElement<string>>(property.Value.GetRawText()));
             }
             additionalProperties = additionalPropertiesDictionary;
             return new XmlDataset(type, description.Value, structure.Value, schema.Value, linkedServiceName, Optional.ToDictionary(parameters), Optional.ToList(annotations), folder.Value, additionalProperties, location.Value, encodingName.Value, nullValue.Value, compression.Value);
diff --git a/src/AzureDataFactory.TestingFramework/Generated/Models/XmlDataset.cs b/src/AzureDataFactory.TestingFramework/Generated/Models/XmlDataset.cs
index 9dc78bb2..05a54ef6 100644
--- a/src/AzureDataFactory.TestingFramework/Generated/Models/XmlDataset.cs
+++ b/src/AzureDataFactory.TestingFramework/Generated/Models/XmlDataset.cs
@@ -41,7 +41,7 @@ public XmlDataset(DataFactoryLinkedServiceReference linkedServiceName) : base(li
         /// <param name="encodingName"> The code page name of the preferred encoding. If not specified, the default value is UTF-8, unless BOM denotes another Unicode encoding. Refer to the name column of the table in the following link to set supported values: https://msdn.microsoft.com/library/system.text.encoding.aspx. Type: string (or Expression with resultType string). </param>
         /// <param name="nullValue"> The null value string. Type: string (or Expression with resultType string). </param>
         /// <param name="compression"> The data compression method used for the json dataset. </param>
-        internal XmlDataset(string datasetType, string description, DataFactoryElement<IList<DatasetDataElement>> structure, DataFactoryElement<IList<DatasetSchemaDataElement>> schema, DataFactoryLinkedServiceReference linkedServiceName, IDictionary<string, EntityParameterSpecification> parameters, IList<BinaryData> annotations, DatasetFolder folder, IDictionary<string, BinaryData> additionalProperties, DatasetLocation dataLocation, DataFactoryElement<string> encodingName, DataFactoryElement<string> nullValue, DatasetCompression compression) : base(datasetType, description, structure, schema, linkedServiceName, parameters, annotations, folder, additionalProperties)
+        internal XmlDataset(string datasetType, string description, DataFactoryElement<IList<DatasetDataElement>> structure, DataFactoryElement<IList<DatasetSchemaDataElement>> schema, DataFactoryLinkedServiceReference linkedServiceName, IDictionary<string, EntityParameterSpecification> parameters, IList<BinaryData> annotations, DatasetFolder folder, IDictionary<string, DataFactoryElement<string>> additionalProperties, DatasetLocation dataLocation, DataFactoryElement<string> encodingName, DataFactoryElement<string> nullValue, DatasetCompression compression) : base(datasetType, description, structure, schema, linkedServiceName, parameters, annotations, folder, additionalProperties)
         {
             DataLocation = dataLocation;
             EncodingName = encodingName;
diff --git a/src/AzureDataFactory.TestingFramework/Generated/Models/XmlReadSettings.Serialization.cs b/src/AzureDataFactory.TestingFramework/Generated/Models/XmlReadSettings.Serialization.cs
index ab48ceb9..f5dcc324 100644
--- a/src/AzureDataFactory.TestingFramework/Generated/Models/XmlReadSettings.Serialization.cs
+++ b/src/AzureDataFactory.TestingFramework/Generated/Models/XmlReadSettings.Serialization.cs
@@ -71,8 +71,8 @@ internal static XmlReadSettings DeserializeXmlReadSettings(JsonElement element)
             Optional<DataFactoryElement<bool>> namespaces = default;
             Optional<BinaryData> namespacePrefixes = default;
             string type = default;
-            IDictionary<string, BinaryData> additionalProperties = default;
-            Dictionary<string, BinaryData> additionalPropertiesDictionary = new Dictionary<string, BinaryData>();
+            IDictionary<string, DataFactoryElement<string>> additionalProperties = default;
+            Dictionary<string, DataFactoryElement<string>> additionalPropertiesDictionary = new Dictionary<string, DataFactoryElement<string>>();
             foreach (var property in element.EnumerateObject())
             {
                 if (property.NameEquals("compressionProperties"u8))
@@ -125,7 +125,7 @@ internal static XmlReadSettings DeserializeXmlReadSettings(JsonElement element)
                     type = property.Value.GetString();
                     continue;
                 }
-                additionalPropertiesDictionary.Add(property.Name, BinaryData.FromString(property.Value.GetRawText()));
+                additionalPropertiesDictionary.Add(property.Name, JsonSerializer.Deserialize<DataFactoryElement<string>>(property.Value.GetRawText()));
             }
             additionalProperties = additionalPropertiesDictionary;
             return new XmlReadSettings(type, additionalProperties, compressionProperties.Value, validationMode.Value, detectDataType.Value, namespaces.Value, namespacePrefixes.Value);
diff --git a/src/AzureDataFactory.TestingFramework/Generated/Models/XmlReadSettings.cs b/src/AzureDataFactory.TestingFramework/Generated/Models/XmlReadSettings.cs
index b0799498..73deee7e 100644
--- a/src/AzureDataFactory.TestingFramework/Generated/Models/XmlReadSettings.cs
+++ b/src/AzureDataFactory.TestingFramework/Generated/Models/XmlReadSettings.cs
@@ -30,7 +30,7 @@ public XmlReadSettings()
         /// <param name="detectDataType"> Indicates whether type detection is enabled when reading the xml files. Type: boolean (or Expression with resultType boolean). </param>
         /// <param name="namespaces"> Indicates whether namespace is enabled when reading the xml files. Type: boolean (or Expression with resultType boolean). </param>
         /// <param name="namespacePrefixes"> Namespace uri to prefix mappings to override the prefixes in column names when namespace is enabled, if no prefix is defined for a namespace uri, the prefix of xml element/attribute name in the xml data file will be used. Example: "{"http://www.example.com/xml":"prefix"}" Type: object (or Expression with resultType object). </param>
-        internal XmlReadSettings(string formatReadSettingsType, IDictionary<string, BinaryData> additionalProperties, CompressionReadSettings compressionProperties, DataFactoryElement<string> validationMode, DataFactoryElement<bool> detectDataType, DataFactoryElement<bool> namespaces, BinaryData namespacePrefixes) : base(formatReadSettingsType, additionalProperties)
+        internal XmlReadSettings(string formatReadSettingsType, IDictionary<string, DataFactoryElement<string>> additionalProperties, CompressionReadSettings compressionProperties, DataFactoryElement<string> validationMode, DataFactoryElement<bool> detectDataType, DataFactoryElement<bool> namespaces, BinaryData namespacePrefixes) : base(formatReadSettingsType, additionalProperties)
         {
             CompressionProperties = compressionProperties;
             ValidationMode = validationMode;
diff --git a/src/AzureDataFactory.TestingFramework/Generated/Models/XmlSource.Serialization.cs b/src/AzureDataFactory.TestingFramework/Generated/Models/XmlSource.Serialization.cs
index 62b39b06..46d8c10d 100644
--- a/src/AzureDataFactory.TestingFramework/Generated/Models/XmlSource.Serialization.cs
+++ b/src/AzureDataFactory.TestingFramework/Generated/Models/XmlSource.Serialization.cs
@@ -83,8 +83,8 @@ internal static XmlSource DeserializeXmlSource(JsonElement element)
             Optional<DataFactoryElement<string>> sourceRetryWait = default;
             Optional<DataFactoryElement<int>> maxConcurrentConnections = default;
             Optional<DataFactoryElement<bool>> disableMetricsCollection = default;
-            IDictionary<string, BinaryData> additionalProperties = default;
-            Dictionary<string, BinaryData> additionalPropertiesDictionary = new Dictionary<string, BinaryData>();
+            IDictionary<string, DataFactoryElement<string>> additionalProperties = default;
+            Dictionary<string, DataFactoryElement<string>> additionalPropertiesDictionary = new Dictionary<string, DataFactoryElement<string>>();
             foreach (var property in element.EnumerateObject())
             {
                 if (property.NameEquals("storeSettings"u8))
@@ -155,7 +155,7 @@ internal static XmlSource DeserializeXmlSource(JsonElement element)
                     disableMetricsCollection = JsonSerializer.Deserialize<DataFactoryElement<bool>>(property.Value.GetRawText());
                     continue;
                 }
-                additionalPropertiesDictionary.Add(property.Name, BinaryData.FromString(property.Value.GetRawText()));
+                additionalPropertiesDictionary.Add(property.Name, JsonSerializer.Deserialize<DataFactoryElement<string>>(property.Value.GetRawText()));
             }
             additionalProperties = additionalPropertiesDictionary;
             return new XmlSource(type, sourceRetryCount.Value, sourceRetryWait.Value, maxConcurrentConnections.Value, disableMetricsCollection.Value, additionalProperties, storeSettings.Value, formatSettings.Value, additionalColumns.Value);
diff --git a/src/AzureDataFactory.TestingFramework/Generated/Models/XmlSource.cs b/src/AzureDataFactory.TestingFramework/Generated/Models/XmlSource.cs
index ccf2bf57..6f974488 100644
--- a/src/AzureDataFactory.TestingFramework/Generated/Models/XmlSource.cs
+++ b/src/AzureDataFactory.TestingFramework/Generated/Models/XmlSource.cs
@@ -32,7 +32,7 @@ public XmlSource()
         /// </param>
         /// <param name="formatSettings"> Xml format settings. </param>
         /// <param name="additionalColumns"> Specifies the additional columns to be added to source data. Type: array of objects(AdditionalColumns) (or Expression with resultType array of objects). </param>
-        internal XmlSource(string copySourceType, DataFactoryElement<int> sourceRetryCount, DataFactoryElement<string> sourceRetryWait, DataFactoryElement<int> maxConcurrentConnections, DataFactoryElement<bool> disableMetricsCollection, IDictionary<string, BinaryData> additionalProperties, StoreReadSettings storeSettings, XmlReadSettings formatSettings, BinaryData additionalColumns) : base(copySourceType, sourceRetryCount, sourceRetryWait, maxConcurrentConnections, disableMetricsCollection, additionalProperties)
+        internal XmlSource(string copySourceType, DataFactoryElement<int> sourceRetryCount, DataFactoryElement<string> sourceRetryWait, DataFactoryElement<int> maxConcurrentConnections, DataFactoryElement<bool> disableMetricsCollection, IDictionary<string, DataFactoryElement<string>> additionalProperties, StoreReadSettings storeSettings, XmlReadSettings formatSettings, BinaryData additionalColumns) : base(copySourceType, sourceRetryCount, sourceRetryWait, maxConcurrentConnections, disableMetricsCollection, additionalProperties)
         {
             StoreSettings = storeSettings;
             FormatSettings = formatSettings;
diff --git a/src/AzureDataFactory.TestingFramework/Generated/Models/ZendeskLinkedService.Serialization.cs b/src/AzureDataFactory.TestingFramework/Generated/Models/ZendeskLinkedService.Serialization.cs
index e81cb9d1..266d61f2 100644
--- a/src/AzureDataFactory.TestingFramework/Generated/Models/ZendeskLinkedService.Serialization.cs
+++ b/src/AzureDataFactory.TestingFramework/Generated/Models/ZendeskLinkedService.Serialization.cs
@@ -114,8 +114,8 @@ internal static ZendeskLinkedService DeserializeZendeskLinkedService(JsonElement
             Optional<DataFactorySecretBaseDefinition> password = default;
             Optional<DataFactorySecretBaseDefinition> apiToken = default;
             Optional<string> encryptedCredential = default;
-            IDictionary<string, BinaryData> additionalProperties = default;
-            Dictionary<string, BinaryData> additionalPropertiesDictionary = new Dictionary<string, BinaryData>();
+            IDictionary<string, DataFactoryElement<string>> additionalProperties = default;
+            Dictionary<string, DataFactoryElement<string>> additionalPropertiesDictionary = new Dictionary<string, DataFactoryElement<string>>();
             foreach (var property in element.EnumerateObject())
             {
                 if (property.NameEquals("type"u8))
@@ -226,7 +226,7 @@ internal static ZendeskLinkedService DeserializeZendeskLinkedService(JsonElement
                     }
                     continue;
                 }
-                additionalPropertiesDictionary.Add(property.Name, BinaryData.FromString(property.Value.GetRawText()));
+                additionalPropertiesDictionary.Add(property.Name, JsonSerializer.Deserialize<DataFactoryElement<string>>(property.Value.GetRawText()));
             }
             additionalProperties = additionalPropertiesDictionary;
             return new ZendeskLinkedService(type, connectVia.Value, description.Value, Optional.ToDictionary(parameters), Optional.ToList(annotations), additionalProperties, authenticationType, url, userName.Value, password, apiToken, encryptedCredential.Value);
diff --git a/src/AzureDataFactory.TestingFramework/Generated/Models/ZendeskLinkedService.cs b/src/AzureDataFactory.TestingFramework/Generated/Models/ZendeskLinkedService.cs
index 1d95bdae..1da0b0a2 100644
--- a/src/AzureDataFactory.TestingFramework/Generated/Models/ZendeskLinkedService.cs
+++ b/src/AzureDataFactory.TestingFramework/Generated/Models/ZendeskLinkedService.cs
@@ -39,7 +39,7 @@ public ZendeskLinkedService(ZendeskAuthenticationType authenticationType, DataFa
         /// <param name="password"> The password of the Zendesk source. </param>
         /// <param name="apiToken"> The api token for the Zendesk source. </param>
         /// <param name="encryptedCredential"> The encrypted credential used for authentication. Credentials are encrypted using the integration runtime credential manager. Type: string. </param>
-        internal ZendeskLinkedService(string linkedServiceType, IntegrationRuntimeReference connectVia, string description, IDictionary<string, EntityParameterSpecification> parameters, IList<BinaryData> annotations, IDictionary<string, BinaryData> additionalProperties, ZendeskAuthenticationType authenticationType, DataFactoryElement<string> uri, DataFactoryElement<string> userName, DataFactorySecretBaseDefinition password, DataFactorySecretBaseDefinition apiToken, string encryptedCredential) : base(linkedServiceType, connectVia, description, parameters, annotations, additionalProperties)
+        internal ZendeskLinkedService(string linkedServiceType, IntegrationRuntimeReference connectVia, string description, IDictionary<string, EntityParameterSpecification> parameters, IList<BinaryData> annotations, IDictionary<string, DataFactoryElement<string>> additionalProperties, ZendeskAuthenticationType authenticationType, DataFactoryElement<string> uri, DataFactoryElement<string> userName, DataFactorySecretBaseDefinition password, DataFactorySecretBaseDefinition apiToken, string encryptedCredential) : base(linkedServiceType, connectVia, description, parameters, annotations, additionalProperties)
         {
             AuthenticationType = authenticationType;
             Uri = uri;
diff --git a/src/AzureDataFactory.TestingFramework/Generated/Models/ZipDeflateReadSettings.Serialization.cs b/src/AzureDataFactory.TestingFramework/Generated/Models/ZipDeflateReadSettings.Serialization.cs
index 495601cd..c13e81d6 100644
--- a/src/AzureDataFactory.TestingFramework/Generated/Models/ZipDeflateReadSettings.Serialization.cs
+++ b/src/AzureDataFactory.TestingFramework/Generated/Models/ZipDeflateReadSettings.Serialization.cs
@@ -43,8 +43,8 @@ internal static ZipDeflateReadSettings DeserializeZipDeflateReadSettings(JsonEle
             }
             Optional<DataFactoryElement<bool>> preserveZipFileNameAsFolder = default;
             string type = default;
-            IDictionary<string, BinaryData> additionalProperties = default;
-            Dictionary<string, BinaryData> additionalPropertiesDictionary = new Dictionary<string, BinaryData>();
+            IDictionary<string, DataFactoryElement<string>> additionalProperties = default;
+            Dictionary<string, DataFactoryElement<string>> additionalPropertiesDictionary = new Dictionary<string, DataFactoryElement<string>>();
             foreach (var property in element.EnumerateObject())
             {
                 if (property.NameEquals("preserveZipFileNameAsFolder"u8))
@@ -61,7 +61,7 @@ internal static ZipDeflateReadSettings DeserializeZipDeflateReadSettings(JsonEle
                     type = property.Value.GetString();
                     continue;
                 }
-                additionalPropertiesDictionary.Add(property.Name, BinaryData.FromString(property.Value.GetRawText()));
+                additionalPropertiesDictionary.Add(property.Name, JsonSerializer.Deserialize<DataFactoryElement<string>>(property.Value.GetRawText()));
             }
             additionalProperties = additionalPropertiesDictionary;
             return new ZipDeflateReadSettings(type, additionalProperties, preserveZipFileNameAsFolder.Value);
diff --git a/src/AzureDataFactory.TestingFramework/Generated/Models/ZipDeflateReadSettings.cs b/src/AzureDataFactory.TestingFramework/Generated/Models/ZipDeflateReadSettings.cs
index 8257e07b..58635256 100644
--- a/src/AzureDataFactory.TestingFramework/Generated/Models/ZipDeflateReadSettings.cs
+++ b/src/AzureDataFactory.TestingFramework/Generated/Models/ZipDeflateReadSettings.cs
@@ -22,7 +22,7 @@ public ZipDeflateReadSettings()
         /// <param name="compressionReadSettingsType"> The Compression setting type. </param>
         /// <param name="additionalProperties"> Additional Properties. </param>
         /// <param name="preserveZipFileNameAsFolder"> Preserve the zip file name as folder path. Type: boolean (or Expression with resultType boolean). </param>
-        internal ZipDeflateReadSettings(string compressionReadSettingsType, IDictionary<string, BinaryData> additionalProperties, DataFactoryElement<bool> preserveZipFileNameAsFolder) : base(compressionReadSettingsType, additionalProperties)
+        internal ZipDeflateReadSettings(string compressionReadSettingsType, IDictionary<string, DataFactoryElement<string>> additionalProperties, DataFactoryElement<bool> preserveZipFileNameAsFolder) : base(compressionReadSettingsType, additionalProperties)
         {
             PreserveZipFileNameAsFolder = preserveZipFileNameAsFolder;
             CompressionReadSettingsType = compressionReadSettingsType ?? "ZipDeflateReadSettings";
diff --git a/src/AzureDataFactory.TestingFramework/Generated/Models/ZohoLinkedService.Serialization.cs b/src/AzureDataFactory.TestingFramework/Generated/Models/ZohoLinkedService.Serialization.cs
index ec56c1d3..865de2ba 100644
--- a/src/AzureDataFactory.TestingFramework/Generated/Models/ZohoLinkedService.Serialization.cs
+++ b/src/AzureDataFactory.TestingFramework/Generated/Models/ZohoLinkedService.Serialization.cs
@@ -130,8 +130,8 @@ internal static ZohoLinkedService DeserializeZohoLinkedService(JsonElement eleme
             Optional<DataFactoryElement<bool>> useHostVerification = default;
             Optional<DataFactoryElement<bool>> usePeerVerification = default;
             Optional<string> encryptedCredential = default;
-            IDictionary<string, BinaryData> additionalProperties = default;
-            Dictionary<string, BinaryData> additionalPropertiesDictionary = new Dictionary<string, BinaryData>();
+            IDictionary<string, DataFactoryElement<string>> additionalProperties = default;
+            Dictionary<string, DataFactoryElement<string>> additionalPropertiesDictionary = new Dictionary<string, DataFactoryElement<string>>();
             foreach (var property in element.EnumerateObject())
             {
                 if (property.NameEquals("type"u8))
@@ -259,7 +259,7 @@ internal static ZohoLinkedService DeserializeZohoLinkedService(JsonElement eleme
                     }
                     continue;
                 }
-                additionalPropertiesDictionary.Add(property.Name, BinaryData.FromString(property.Value.GetRawText()));
+                additionalPropertiesDictionary.Add(property.Name, JsonSerializer.Deserialize<DataFactoryElement<string>>(property.Value.GetRawText()));
             }
             additionalProperties = additionalPropertiesDictionary;
             return new ZohoLinkedService(type, connectVia.Value, description.Value, Optional.ToDictionary(parameters), Optional.ToList(annotations), additionalProperties, connectionProperties.Value, endpoint.Value, accessToken, useEncryptedEndpoints.Value, useHostVerification.Value, usePeerVerification.Value, encryptedCredential.Value);
diff --git a/src/AzureDataFactory.TestingFramework/Generated/Models/ZohoLinkedService.cs b/src/AzureDataFactory.TestingFramework/Generated/Models/ZohoLinkedService.cs
index 06d08f48..c1d15b9b 100644
--- a/src/AzureDataFactory.TestingFramework/Generated/Models/ZohoLinkedService.cs
+++ b/src/AzureDataFactory.TestingFramework/Generated/Models/ZohoLinkedService.cs
@@ -32,7 +32,7 @@ public ZohoLinkedService()
         /// <param name="useHostVerification"> Specifies whether to require the host name in the server's certificate to match the host name of the server when connecting over SSL. The default value is true. </param>
         /// <param name="usePeerVerification"> Specifies whether to verify the identity of the server when connecting over SSL. The default value is true. </param>
         /// <param name="encryptedCredential"> The encrypted credential used for authentication. Credentials are encrypted using the integration runtime credential manager. Type: string. </param>
-        internal ZohoLinkedService(string linkedServiceType, IntegrationRuntimeReference connectVia, string description, IDictionary<string, EntityParameterSpecification> parameters, IList<BinaryData> annotations, IDictionary<string, BinaryData> additionalProperties, BinaryData connectionProperties, DataFactoryElement<string> endpoint, DataFactorySecretBaseDefinition accessToken, DataFactoryElement<bool> useEncryptedEndpoints, DataFactoryElement<bool> useHostVerification, DataFactoryElement<bool> usePeerVerification, string encryptedCredential) : base(linkedServiceType, connectVia, description, parameters, annotations, additionalProperties)
+        internal ZohoLinkedService(string linkedServiceType, IntegrationRuntimeReference connectVia, string description, IDictionary<string, EntityParameterSpecification> parameters, IList<BinaryData> annotations, IDictionary<string, DataFactoryElement<string>> additionalProperties, BinaryData connectionProperties, DataFactoryElement<string> endpoint, DataFactorySecretBaseDefinition accessToken, DataFactoryElement<bool> useEncryptedEndpoints, DataFactoryElement<bool> useHostVerification, DataFactoryElement<bool> usePeerVerification, string encryptedCredential) : base(linkedServiceType, connectVia, description, parameters, annotations, additionalProperties)
         {
             ConnectionProperties = connectionProperties;
             Endpoint = endpoint;
diff --git a/src/AzureDataFactory.TestingFramework/Generated/Models/ZohoObjectDataset.Serialization.cs b/src/AzureDataFactory.TestingFramework/Generated/Models/ZohoObjectDataset.Serialization.cs
index e07904da..6598300a 100644
--- a/src/AzureDataFactory.TestingFramework/Generated/Models/ZohoObjectDataset.Serialization.cs
+++ b/src/AzureDataFactory.TestingFramework/Generated/Models/ZohoObjectDataset.Serialization.cs
@@ -104,8 +104,8 @@ internal static ZohoObjectDataset DeserializeZohoObjectDataset(JsonElement eleme
             Optional<IList<BinaryData>> annotations = default;
             Optional<DatasetFolder> folder = default;
             Optional<DataFactoryElement<string>> tableName = default;
-            IDictionary<string, BinaryData> additionalProperties = default;
-            Dictionary<string, BinaryData> additionalPropertiesDictionary = new Dictionary<string, BinaryData>();
+            IDictionary<string, DataFactoryElement<string>> additionalProperties = default;
+            Dictionary<string, DataFactoryElement<string>> additionalPropertiesDictionary = new Dictionary<string, DataFactoryElement<string>>();
             foreach (var property in element.EnumerateObject())
             {
                 if (property.NameEquals("type"u8))
@@ -206,7 +206,7 @@ internal static ZohoObjectDataset DeserializeZohoObjectDataset(JsonElement eleme
                     }
                     continue;
                 }
-                additionalPropertiesDictionary.Add(property.Name, BinaryData.FromString(property.Value.GetRawText()));
+                additionalPropertiesDictionary.Add(property.Name, JsonSerializer.Deserialize<DataFactoryElement<string>>(property.Value.GetRawText()));
             }
             additionalProperties = additionalPropertiesDictionary;
             return new ZohoObjectDataset(type, description.Value, structure.Value, schema.Value, linkedServiceName, Optional.ToDictionary(parameters), Optional.ToList(annotations), folder.Value, additionalProperties, tableName.Value);
diff --git a/src/AzureDataFactory.TestingFramework/Generated/Models/ZohoObjectDataset.cs b/src/AzureDataFactory.TestingFramework/Generated/Models/ZohoObjectDataset.cs
index ac267918..ccb48ab4 100644
--- a/src/AzureDataFactory.TestingFramework/Generated/Models/ZohoObjectDataset.cs
+++ b/src/AzureDataFactory.TestingFramework/Generated/Models/ZohoObjectDataset.cs
@@ -34,7 +34,7 @@ public ZohoObjectDataset(DataFactoryLinkedServiceReference linkedServiceName) :
         /// <param name="folder"> The folder that this Dataset is in. If not specified, Dataset will appear at the root level. </param>
         /// <param name="additionalProperties"> Additional Properties. </param>
         /// <param name="tableName"> The table name. Type: string (or Expression with resultType string). </param>
-        internal ZohoObjectDataset(string datasetType, string description, DataFactoryElement<IList<DatasetDataElement>> structure, DataFactoryElement<IList<DatasetSchemaDataElement>> schema, DataFactoryLinkedServiceReference linkedServiceName, IDictionary<string, EntityParameterSpecification> parameters, IList<BinaryData> annotations, DatasetFolder folder, IDictionary<string, BinaryData> additionalProperties, DataFactoryElement<string> tableName) : base(datasetType, description, structure, schema, linkedServiceName, parameters, annotations, folder, additionalProperties)
+        internal ZohoObjectDataset(string datasetType, string description, DataFactoryElement<IList<DatasetDataElement>> structure, DataFactoryElement<IList<DatasetSchemaDataElement>> schema, DataFactoryLinkedServiceReference linkedServiceName, IDictionary<string, EntityParameterSpecification> parameters, IList<BinaryData> annotations, DatasetFolder folder, IDictionary<string, DataFactoryElement<string>> additionalProperties, DataFactoryElement<string> tableName) : base(datasetType, description, structure, schema, linkedServiceName, parameters, annotations, folder, additionalProperties)
         {
             TableName = tableName;
             DatasetType = datasetType ?? "ZohoObject";
diff --git a/src/AzureDataFactory.TestingFramework/Generated/Models/ZohoSource.Serialization.cs b/src/AzureDataFactory.TestingFramework/Generated/Models/ZohoSource.Serialization.cs
index a3a8a116..49c79656 100644
--- a/src/AzureDataFactory.TestingFramework/Generated/Models/ZohoSource.Serialization.cs
+++ b/src/AzureDataFactory.TestingFramework/Generated/Models/ZohoSource.Serialization.cs
@@ -83,8 +83,8 @@ internal static ZohoSource DeserializeZohoSource(JsonElement element)
             Optional<DataFactoryElement<string>> sourceRetryWait = default;
             Optional<DataFactoryElement<int>> maxConcurrentConnections = default;
             Optional<DataFactoryElement<bool>> disableMetricsCollection = default;
-            IDictionary<string, BinaryData> additionalProperties = default;
-            Dictionary<string, BinaryData> additionalPropertiesDictionary = new Dictionary<string, BinaryData>();
+            IDictionary<string, DataFactoryElement<string>> additionalProperties = default;
+            Dictionary<string, DataFactoryElement<string>> additionalPropertiesDictionary = new Dictionary<string, DataFactoryElement<string>>();
             foreach (var property in element.EnumerateObject())
             {
                 if (property.NameEquals("query"u8))
@@ -155,7 +155,7 @@ internal static ZohoSource DeserializeZohoSource(JsonElement element)
                     disableMetricsCollection = JsonSerializer.Deserialize<DataFactoryElement<bool>>(property.Value.GetRawText());
                     continue;
                 }
-                additionalPropertiesDictionary.Add(property.Name, BinaryData.FromString(property.Value.GetRawText()));
+                additionalPropertiesDictionary.Add(property.Name, JsonSerializer.Deserialize<DataFactoryElement<string>>(property.Value.GetRawText()));
             }
             additionalProperties = additionalPropertiesDictionary;
             return new ZohoSource(type, sourceRetryCount.Value, sourceRetryWait.Value, maxConcurrentConnections.Value, disableMetricsCollection.Value, additionalProperties, queryTimeout.Value, additionalColumns.Value, query.Value);
diff --git a/src/AzureDataFactory.TestingFramework/Generated/Models/ZohoSource.cs b/src/AzureDataFactory.TestingFramework/Generated/Models/ZohoSource.cs
index b4d47080..6a7117b8 100644
--- a/src/AzureDataFactory.TestingFramework/Generated/Models/ZohoSource.cs
+++ b/src/AzureDataFactory.TestingFramework/Generated/Models/ZohoSource.cs
@@ -28,7 +28,7 @@ public ZohoSource()
         /// <param name="queryTimeout"> Query timeout. Type: string (or Expression with resultType string), pattern: ((\d+)\.)?(\d\d):(60|([0-5][0-9])):(60|([0-5][0-9])). </param>
         /// <param name="additionalColumns"> Specifies the additional columns to be added to source data. Type: array of objects(AdditionalColumns) (or Expression with resultType array of objects). </param>
         /// <param name="query"> A query to retrieve data from source. Type: string (or Expression with resultType string). </param>
-        internal ZohoSource(string copySourceType, DataFactoryElement<int> sourceRetryCount, DataFactoryElement<string> sourceRetryWait, DataFactoryElement<int> maxConcurrentConnections, DataFactoryElement<bool> disableMetricsCollection, IDictionary<string, BinaryData> additionalProperties, DataFactoryElement<string> queryTimeout, BinaryData additionalColumns, DataFactoryElement<string> query) : base(copySourceType, sourceRetryCount, sourceRetryWait, maxConcurrentConnections, disableMetricsCollection, additionalProperties, queryTimeout, additionalColumns)
+        internal ZohoSource(string copySourceType, DataFactoryElement<int> sourceRetryCount, DataFactoryElement<string> sourceRetryWait, DataFactoryElement<int> maxConcurrentConnections, DataFactoryElement<bool> disableMetricsCollection, IDictionary<string, DataFactoryElement<string>> additionalProperties, DataFactoryElement<string> queryTimeout, BinaryData additionalColumns, DataFactoryElement<string> query) : base(copySourceType, sourceRetryCount, sourceRetryWait, maxConcurrentConnections, disableMetricsCollection, additionalProperties, queryTimeout, additionalColumns)
         {
             Query = query;
             CopySourceType = copySourceType ?? "ZohoSource";
diff --git a/src/AzureDataFactory.TestingFramework/Generated/Pipeline.cs b/src/AzureDataFactory.TestingFramework/Generated/Pipeline.cs
index e35b4eb4..8a132f36 100644
--- a/src/AzureDataFactory.TestingFramework/Generated/Pipeline.cs
+++ b/src/AzureDataFactory.TestingFramework/Generated/Pipeline.cs
@@ -6,6 +6,7 @@
 #nullable disable
 
 using Azure.Core;
+using Azure.Core.Expressions.DataFactory;
 using AzureDataFactory.TestingFramework.Models;
 using Azure.ResourceManager.Models;
 
@@ -24,8 +25,8 @@ public Pipeline()
             Parameters = new ChangeTrackingDictionary<string, EntityParameterSpecification>();
             Variables = new ChangeTrackingDictionary<string, PipelineVariableSpecification>();
             Annotations = new ChangeTrackingList<BinaryData>();
-            RunDimensions = new ChangeTrackingDictionary<string, BinaryData>();
-            AdditionalProperties = new ChangeTrackingDictionary<string, BinaryData>();
+            RunDimensions = new ChangeTrackingDictionary<string, DataFactoryElement<string>>();
+            AdditionalProperties = new ChangeTrackingDictionary<string, DataFactoryElement<string>>();
         }
 
         /// <summary> Initializes a new instance of DataFactoryPipelineData. </summary>
@@ -48,7 +49,7 @@ public Pipeline()
         /// <param name="policy"> Pipeline Policy. </param>
         /// <param name="eTag"> Etag identifies change in the resource. </param>
         /// <param name="additionalProperties"> Additional Properties. </param>
-        internal Pipeline(ResourceIdentifier id, string name, ResourceType resourceType, SystemData systemData, string description, IList<PipelineActivity> activities, IDictionary<string, EntityParameterSpecification> parameters, IDictionary<string, PipelineVariableSpecification> variables, int? concurrency, IList<BinaryData> annotations, IDictionary<string, BinaryData> runDimensions, PipelineFolder folder, DataFactoryPipelinePolicy policy, ETag? eTag, IDictionary<string, BinaryData> additionalProperties) : base(id, name, resourceType, systemData)
+        internal Pipeline(ResourceIdentifier id, string name, ResourceType resourceType, SystemData systemData, string description, IList<PipelineActivity> activities, IDictionary<string, EntityParameterSpecification> parameters, IDictionary<string, PipelineVariableSpecification> variables, int? concurrency, IList<BinaryData> annotations, IDictionary<string, DataFactoryElement<string>> runDimensions, PipelineFolder folder, DataFactoryPipelinePolicy policy, ETag? eTag, IDictionary<string, DataFactoryElement<string>> additionalProperties) : base(id, name, resourceType, systemData)
         {
             Description = description;
             Activities = activities;
@@ -138,7 +139,7 @@ internal Pipeline(ResourceIdentifier id, string name, ResourceType resourceType,
         /// </list>
         /// </para>
         /// </summary>
-        public IDictionary<string, BinaryData> RunDimensions { get; }
+        public IDictionary<string, DataFactoryElement<string>> RunDimensions { get; }
         /// <summary> The folder that this Pipeline is in. If not specified, Pipeline will appear at the root level. </summary>
         internal PipelineFolder Folder { get; set; }
         /// <summary> The name of the folder that this Pipeline is in. </summary>
@@ -228,6 +229,6 @@ public BinaryData ElapsedTimeMetricDuration
         /// </list>
         /// </para>
         /// </summary>
-        public IDictionary<string, BinaryData> AdditionalProperties { get; }
+        public IDictionary<string, DataFactoryElement<string>> AdditionalProperties { get; }
     }
 }
diff --git a/src/AzureDataFactory.TestingFramework/Generated/RestOperations/PipelinesRestOperations.cs b/src/AzureDataFactory.TestingFramework/Generated/RestOperations/PipelinesRestOperations.cs
index d4bb29f2..4f1bfd58 100644
--- a/src/AzureDataFactory.TestingFramework/Generated/RestOperations/PipelinesRestOperations.cs
+++ b/src/AzureDataFactory.TestingFramework/Generated/RestOperations/PipelinesRestOperations.cs
@@ -7,6 +7,7 @@
 
 using System.Text.Json;
 using Azure.Core;
+using Azure.Core.Expressions.DataFactory;
 using Azure.Core.Pipeline;
 using AzureDataFactory.TestingFramework.Models;
 
@@ -382,7 +383,7 @@ public Response Delete(string subscriptionId, string resourceGroupName, string f
             }
         }
 
-        internal HttpMessage CreateCreateRunRequest(string subscriptionId, string resourceGroupName, string factoryName, string pipelineName, IDictionary<string, BinaryData> parameterValueSpecification, string referencePipelineRunId, bool? isRecovery, string startActivityName, bool? startFromFailure)
+        internal HttpMessage CreateCreateRunRequest(string subscriptionId, string resourceGroupName, string factoryName, string pipelineName, IDictionary<string, DataFactoryElement<string>> parameterValueSpecification, string referencePipelineRunId, bool? isRecovery, string startActivityName, bool? startFromFailure)
         {
             var message = _pipeline.CreateMessage();
             var request = message.Request;
@@ -456,7 +457,7 @@ internal HttpMessage CreateCreateRunRequest(string subscriptionId, string resour
         /// <param name="cancellationToken"> The cancellation token to use. </param>
         /// <exception cref="ArgumentNullException"> <paramref name="subscriptionId"/>, <paramref name="resourceGroupName"/>, <paramref name="factoryName"/> or <paramref name="pipelineName"/> is null. </exception>
         /// <exception cref="ArgumentException"> <paramref name="subscriptionId"/>, <paramref name="resourceGroupName"/>, <paramref name="factoryName"/> or <paramref name="pipelineName"/> is an empty string, and was expected to be non-empty. </exception>
-        public async Task<Response<PipelineCreateRunResult>> CreateRunAsync(string subscriptionId, string resourceGroupName, string factoryName, string pipelineName, IDictionary<string, BinaryData> parameterValueSpecification = null, string referencePipelineRunId = null, bool? isRecovery = null, string startActivityName = null, bool? startFromFailure = null, CancellationToken cancellationToken = default)
+        public async Task<Response<PipelineCreateRunResult>> CreateRunAsync(string subscriptionId, string resourceGroupName, string factoryName, string pipelineName, IDictionary<string, DataFactoryElement<string>> parameterValueSpecification = null, string referencePipelineRunId = null, bool? isRecovery = null, string startActivityName = null, bool? startFromFailure = null, CancellationToken cancellationToken = default)
         {
             Argument.AssertNotNullOrEmpty(subscriptionId, nameof(subscriptionId));
             Argument.AssertNotNullOrEmpty(resourceGroupName, nameof(resourceGroupName));
@@ -492,7 +493,7 @@ public async Task<Response<PipelineCreateRunResult>> CreateRunAsync(string subsc
         /// <param name="cancellationToken"> The cancellation token to use. </param>
         /// <exception cref="ArgumentNullException"> <paramref name="subscriptionId"/>, <paramref name="resourceGroupName"/>, <paramref name="factoryName"/> or <paramref name="pipelineName"/> is null. </exception>
         /// <exception cref="ArgumentException"> <paramref name="subscriptionId"/>, <paramref name="resourceGroupName"/>, <paramref name="factoryName"/> or <paramref name="pipelineName"/> is an empty string, and was expected to be non-empty. </exception>
-        public Response<PipelineCreateRunResult> CreateRun(string subscriptionId, string resourceGroupName, string factoryName, string pipelineName, IDictionary<string, BinaryData> parameterValueSpecification = null, string referencePipelineRunId = null, bool? isRecovery = null, string startActivityName = null, bool? startFromFailure = null, CancellationToken cancellationToken = default)
+        public Response<PipelineCreateRunResult> CreateRun(string subscriptionId, string resourceGroupName, string factoryName, string pipelineName, IDictionary<string, DataFactoryElement<string>> parameterValueSpecification = null, string referencePipelineRunId = null, bool? isRecovery = null, string startActivityName = null, bool? startFromFailure = null, CancellationToken cancellationToken = default)
         {
             Argument.AssertNotNullOrEmpty(subscriptionId, nameof(subscriptionId));
             Argument.AssertNotNullOrEmpty(resourceGroupName, nameof(resourceGroupName));