diff --git a/eng/mgmt/mgmtmetadata/datafactory_resource-manager.txt b/eng/mgmt/mgmtmetadata/datafactory_resource-manager.txt
index 851c0094f1a1..b0ea784b40a1 100644
--- a/eng/mgmt/mgmtmetadata/datafactory_resource-manager.txt
+++ b/eng/mgmt/mgmtmetadata/datafactory_resource-manager.txt
@@ -4,11 +4,11 @@ Commencing code generation
 Generating CSharp code
 Executing AutoRest command
 cmd.exe /c autorest.cmd https://github.com/Azure/azure-rest-api-specs/blob/master/specification/datafactory/resource-manager/readme.md --csharp --version=v2 --reflect-api-versions --tag=package-2018-06 --csharp-sdks-folder=D:\Projects\azure-sdk-for-net\sdk
-2020-09-01 05:25:03 UTC
+2020-09-09 02:32:57 UTC
 Azure-rest-api-specs repository information
 GitHub fork: Azure
 Branch:      master
-Commit:      aa96f138f37c06bdbf3458a4fa327f08a593594c
+Commit:      d2efa993873365cc9f2db920479a3e45bd8d7f0f
 AutoRest information
 Requested version: v2
 Bootstrapper version:    autorest@2.0.4413
diff --git a/sdk/datafactory/Microsoft.Azure.Management.DataFactory/src/CHANGELOG.md b/sdk/datafactory/Microsoft.Azure.Management.DataFactory/src/CHANGELOG.md
index 9143e2d4c91c..2dedceff2c88 100644
--- a/sdk/datafactory/Microsoft.Azure.Management.DataFactory/src/CHANGELOG.md
+++ b/sdk/datafactory/Microsoft.Azure.Management.DataFactory/src/CHANGELOG.md
@@ -4,6 +4,7 @@
 ###  Feature Additions
 - Added logLevel/enableReliableLogging to LogStorageSettings
 - Support Tar GZip compression type in Data Factory
+- Added maxRowPerFile/fileNamePrefix to tabular format settings
 
 ## Version 4.11.0
 ###  Feature Additions
diff --git a/sdk/datafactory/Microsoft.Azure.Management.DataFactory/src/Generated/DataFactoryManagementClient.cs b/sdk/datafactory/Microsoft.Azure.Management.DataFactory/src/Generated/DataFactoryManagementClient.cs
index 028d20fc7a8a..46f1baaa95ab 100644
--- a/sdk/datafactory/Microsoft.Azure.Management.DataFactory/src/Generated/DataFactoryManagementClient.cs
+++ b/sdk/datafactory/Microsoft.Azure.Management.DataFactory/src/Generated/DataFactoryManagementClient.cs
@@ -501,6 +501,8 @@ private void Initialize()
             DeserializationSettings.Converters.Add(new PolymorphicDeserializeJsonConverter<CustomSetupBase>("type"));
             SerializationSettings.Converters.Add(new PolymorphicSerializeJsonConverter<SsisObjectMetadata>("type"));
             DeserializationSettings.Converters.Add(new PolymorphicDeserializeJsonConverter<SsisObjectMetadata>("type"));
+            SerializationSettings.Converters.Add(new PolymorphicSerializeJsonConverter<CopyTranslator>("type"));
+            DeserializationSettings.Converters.Add(new PolymorphicDeserializeJsonConverter<CopyTranslator>("type"));
             CustomInitialize();
             DeserializationSettings.Converters.Add(new TransformationJsonConverter());
             DeserializationSettings.Converters.Add(new CloudErrorJsonConverter());
diff --git a/sdk/datafactory/Microsoft.Azure.Management.DataFactory/src/Generated/Models/AvroWriteSettings.cs b/sdk/datafactory/Microsoft.Azure.Management.DataFactory/src/Generated/Models/AvroWriteSettings.cs
index f0bdfe3267bd..dfa465d8007b 100644
--- a/sdk/datafactory/Microsoft.Azure.Management.DataFactory/src/Generated/Models/AvroWriteSettings.cs
+++ b/sdk/datafactory/Microsoft.Azure.Management.DataFactory/src/Generated/Models/AvroWriteSettings.cs
@@ -37,11 +37,20 @@ public AvroWriteSettings()
         /// which is required in AVRO spec.</param>
         /// <param name="recordNamespace">Record namespace in the write
         /// result.</param>
-        public AvroWriteSettings(IDictionary<string, object> additionalProperties = default(IDictionary<string, object>), string recordName = default(string), string recordNamespace = default(string))
+        /// <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>
+        public AvroWriteSettings(IDictionary<string, object> additionalProperties = default(IDictionary<string, object>), string recordName = default(string), string recordNamespace = default(string), object maxRowsPerFile = default(object), object fileNamePrefix = default(object))
             : base(additionalProperties)
         {
             RecordName = recordName;
             RecordNamespace = recordNamespace;
+            MaxRowsPerFile = maxRowsPerFile;
+            FileNamePrefix = fileNamePrefix;
             CustomInit();
         }
 
@@ -63,5 +72,22 @@ public AvroWriteSettings()
         [JsonProperty(PropertyName = "recordNamespace")]
         public string RecordNamespace { get; set; }
 
+        /// <summary>
+        /// Gets or sets limit the written file's row count to be smaller than
+        /// or equal to the specified count. Type: integer (or Expression with
+        /// resultType integer).
+        /// </summary>
+        [JsonProperty(PropertyName = "maxRowsPerFile")]
+        public object MaxRowsPerFile { get; set; }
+
+        /// <summary>
+        /// Gets or sets specifies the file name pattern
+        /// &amp;lt;fileNamePrefix&amp;gt;_&amp;lt;fileIndex&amp;gt;.&amp;lt;fileExtension&amp;gt;
+        /// when copy from non-file based store without partitionOptions. Type:
+        /// string (or Expression with resultType string).
+        /// </summary>
+        [JsonProperty(PropertyName = "fileNamePrefix")]
+        public object FileNamePrefix { get; set; }
+
     }
 }
diff --git a/sdk/datafactory/Microsoft.Azure.Management.DataFactory/src/Extensions/CopyBehaviorType.cs b/sdk/datafactory/Microsoft.Azure.Management.DataFactory/src/Generated/Models/CopyBehaviorType.cs
similarity index 86%
rename from sdk/datafactory/Microsoft.Azure.Management.DataFactory/src/Extensions/CopyBehaviorType.cs
rename to sdk/datafactory/Microsoft.Azure.Management.DataFactory/src/Generated/Models/CopyBehaviorType.cs
index 42805261ca0e..01cc5d50b1bb 100644
--- a/sdk/datafactory/Microsoft.Azure.Management.DataFactory/src/Extensions/CopyBehaviorType.cs
+++ b/sdk/datafactory/Microsoft.Azure.Management.DataFactory/src/Generated/Models/CopyBehaviorType.cs
@@ -1,10 +1,12 @@
+// <auto-generated>
 // Copyright (c) Microsoft Corporation. All rights reserved.
 // Licensed under the MIT License. See License.txt in the project root for
 // license information.
 //
-// Code generated by Microsoft (R) AutoRest Code Generator 1.1.0.0
+// Code generated by Microsoft (R) AutoRest Code Generator.
 // Changes may cause incorrect behavior and will be lost if the code is
 // regenerated.
+// </auto-generated>
 
 namespace Microsoft.Azure.Management.DataFactory.Models
 {
diff --git a/sdk/datafactory/Microsoft.Azure.Management.DataFactory/src/Extensions/CopyTranslator.cs b/sdk/datafactory/Microsoft.Azure.Management.DataFactory/src/Generated/Models/CopyTranslator.cs
similarity index 100%
rename from sdk/datafactory/Microsoft.Azure.Management.DataFactory/src/Extensions/CopyTranslator.cs
rename to sdk/datafactory/Microsoft.Azure.Management.DataFactory/src/Generated/Models/CopyTranslator.cs
diff --git a/sdk/datafactory/Microsoft.Azure.Management.DataFactory/src/Extensions/DatasetDataElement.cs b/sdk/datafactory/Microsoft.Azure.Management.DataFactory/src/Generated/Models/DatasetDataElement.cs
similarity index 90%
rename from sdk/datafactory/Microsoft.Azure.Management.DataFactory/src/Extensions/DatasetDataElement.cs
rename to sdk/datafactory/Microsoft.Azure.Management.DataFactory/src/Generated/Models/DatasetDataElement.cs
index 3a0df0cf6014..d6871725ed8b 100644
--- a/sdk/datafactory/Microsoft.Azure.Management.DataFactory/src/Extensions/DatasetDataElement.cs
+++ b/sdk/datafactory/Microsoft.Azure.Management.DataFactory/src/Generated/Models/DatasetDataElement.cs
@@ -1,16 +1,15 @@
+// <auto-generated>
 // Copyright (c) Microsoft Corporation. All rights reserved.
 // Licensed under the MIT License. See License.txt in the project root for
 // license information.
 //
-// Code generated by Microsoft (R) AutoRest Code Generator 1.1.0.0
+// Code generated by Microsoft (R) AutoRest Code Generator.
 // Changes may cause incorrect behavior and will be lost if the code is
 // regenerated.
+// </auto-generated>
 
 namespace Microsoft.Azure.Management.DataFactory.Models
 {
-    using Microsoft.Azure;
-    using Microsoft.Azure.Management;
-    using Microsoft.Azure.Management.DataFactory;
     using Newtonsoft.Json;
     using System.Linq;
 
@@ -24,7 +23,7 @@ public partial class DatasetDataElement
         /// </summary>
         public DatasetDataElement()
         {
-          CustomInit();
+            CustomInit();
         }
 
         /// <summary>
diff --git a/sdk/datafactory/Microsoft.Azure.Management.DataFactory/src/Generated/Models/DatasetSchemaDataElement.cs b/sdk/datafactory/Microsoft.Azure.Management.DataFactory/src/Generated/Models/DatasetSchemaDataElement.cs
new file mode 100644
index 000000000000..b79a156e2b66
--- /dev/null
+++ b/sdk/datafactory/Microsoft.Azure.Management.DataFactory/src/Generated/Models/DatasetSchemaDataElement.cs
@@ -0,0 +1,75 @@
+// <auto-generated>
+// Copyright (c) Microsoft Corporation. All rights reserved.
+// Licensed under the MIT License. See License.txt in the project root for
+// license information.
+//
+// Code generated by Microsoft (R) AutoRest Code Generator.
+// Changes may cause incorrect behavior and will be lost if the code is
+// regenerated.
+// </auto-generated>
+
+namespace Microsoft.Azure.Management.DataFactory.Models
+{
+    using Newtonsoft.Json;
+    using System.Collections;
+    using System.Collections.Generic;
+    using System.Linq;
+
+    /// <summary>
+    /// Columns that define the physical type schema of the dataset.
+    /// </summary>
+    public partial class DatasetSchemaDataElement
+    {
+        /// <summary>
+        /// Initializes a new instance of the DatasetSchemaDataElement class.
+        /// </summary>
+        public DatasetSchemaDataElement()
+        {
+            CustomInit();
+        }
+
+        /// <summary>
+        /// Initializes a new instance of the DatasetSchemaDataElement class.
+        /// </summary>
+        /// <param name="additionalProperties">Unmatched properties from the
+        /// message are deserialized this collection</param>
+        /// <param name="name">Name of the schema column. Type: string (or
+        /// Expression with resultType string).</param>
+        /// <param name="type">Type of the schema column. Type: string (or
+        /// Expression with resultType string).</param>
+        public DatasetSchemaDataElement(IDictionary<string, object> additionalProperties = default(IDictionary<string, object>), object name = default(object), object type = default(object))
+        {
+            AdditionalProperties = additionalProperties;
+            Name = name;
+            Type = type;
+            CustomInit();
+        }
+
+        /// <summary>
+        /// An initialization method that performs custom operations like setting defaults
+        /// </summary>
+        partial void CustomInit();
+
+        /// <summary>
+        /// Gets or sets unmatched properties from the message are deserialized
+        /// this collection
+        /// </summary>
+        [JsonExtensionData]
+        public IDictionary<string, object> AdditionalProperties { get; set; }
+
+        /// <summary>
+        /// Gets or sets name of the schema column. Type: string (or Expression
+        /// with resultType string).
+        /// </summary>
+        [JsonProperty(PropertyName = "name")]
+        public object Name { get; set; }
+
+        /// <summary>
+        /// Gets or sets type of the schema column. Type: string (or Expression
+        /// with resultType string).
+        /// </summary>
+        [JsonProperty(PropertyName = "type")]
+        public object Type { get; set; }
+
+    }
+}
diff --git a/sdk/datafactory/Microsoft.Azure.Management.DataFactory/src/Generated/Models/DelimitedTextWriteSettings.cs b/sdk/datafactory/Microsoft.Azure.Management.DataFactory/src/Generated/Models/DelimitedTextWriteSettings.cs
index a54f9c2e64bb..31e6a7d966ef 100644
--- a/sdk/datafactory/Microsoft.Azure.Management.DataFactory/src/Generated/Models/DelimitedTextWriteSettings.cs
+++ b/sdk/datafactory/Microsoft.Azure.Management.DataFactory/src/Generated/Models/DelimitedTextWriteSettings.cs
@@ -39,11 +39,20 @@ public DelimitedTextWriteSettings()
         /// <param name="quoteAllText">Indicates whether string values should
         /// always be enclosed with quotes. Type: boolean (or Expression with
         /// resultType boolean).</param>
-        public DelimitedTextWriteSettings(object fileExtension, IDictionary<string, object> additionalProperties = default(IDictionary<string, object>), object quoteAllText = default(object))
+        /// <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>
+        public DelimitedTextWriteSettings(object fileExtension, IDictionary<string, object> additionalProperties = default(IDictionary<string, object>), object quoteAllText = default(object), object maxRowsPerFile = default(object), object fileNamePrefix = default(object))
             : base(additionalProperties)
         {
             QuoteAllText = quoteAllText;
             FileExtension = fileExtension;
+            MaxRowsPerFile = maxRowsPerFile;
+            FileNamePrefix = fileNamePrefix;
             CustomInit();
         }
 
@@ -67,6 +76,23 @@ public DelimitedTextWriteSettings()
         [JsonProperty(PropertyName = "fileExtension")]
         public object FileExtension { get; set; }
 
+        /// <summary>
+        /// Gets or sets limit the written file's row count to be smaller than
+        /// or equal to the specified count. Type: integer (or Expression with
+        /// resultType integer).
+        /// </summary>
+        [JsonProperty(PropertyName = "maxRowsPerFile")]
+        public object MaxRowsPerFile { get; set; }
+
+        /// <summary>
+        /// Gets or sets specifies the file name pattern
+        /// &amp;lt;fileNamePrefix&amp;gt;_&amp;lt;fileIndex&amp;gt;.&amp;lt;fileExtension&amp;gt;
+        /// when copy from non-file based store without partitionOptions. Type:
+        /// string (or Expression with resultType string).
+        /// </summary>
+        [JsonProperty(PropertyName = "fileNamePrefix")]
+        public object FileNamePrefix { get; set; }
+
         /// <summary>
         /// Validate the object.
         /// </summary>
diff --git a/sdk/datafactory/Microsoft.Azure.Management.DataFactory/src/Generated/Models/OrcSink.cs b/sdk/datafactory/Microsoft.Azure.Management.DataFactory/src/Generated/Models/OrcSink.cs
index 0eb07d896d9e..d90366477c64 100644
--- a/sdk/datafactory/Microsoft.Azure.Management.DataFactory/src/Generated/Models/OrcSink.cs
+++ b/sdk/datafactory/Microsoft.Azure.Management.DataFactory/src/Generated/Models/OrcSink.cs
@@ -47,10 +47,12 @@ public OrcSink()
         /// connection count for the sink data store. Type: integer (or
         /// Expression with resultType integer).</param>
         /// <param name="storeSettings">ORC store settings.</param>
-        public OrcSink(IDictionary<string, object> additionalProperties = default(IDictionary<string, object>), object writeBatchSize = default(object), object writeBatchTimeout = default(object), object sinkRetryCount = default(object), object sinkRetryWait = default(object), object maxConcurrentConnections = default(object), StoreWriteSettings storeSettings = default(StoreWriteSettings))
+        /// <param name="formatSettings">ORC format settings.</param>
+        public OrcSink(IDictionary<string, object> additionalProperties = default(IDictionary<string, object>), object writeBatchSize = default(object), object writeBatchTimeout = default(object), object sinkRetryCount = default(object), object sinkRetryWait = default(object), object maxConcurrentConnections = default(object), StoreWriteSettings storeSettings = default(StoreWriteSettings), OrcWriteSettings formatSettings = default(OrcWriteSettings))
             : base(additionalProperties, writeBatchSize, writeBatchTimeout, sinkRetryCount, sinkRetryWait, maxConcurrentConnections)
         {
             StoreSettings = storeSettings;
+            FormatSettings = formatSettings;
             CustomInit();
         }
 
@@ -65,5 +67,11 @@ public OrcSink()
         [JsonProperty(PropertyName = "storeSettings")]
         public StoreWriteSettings StoreSettings { get; set; }
 
+        /// <summary>
+        /// Gets or sets ORC format settings.
+        /// </summary>
+        [JsonProperty(PropertyName = "formatSettings")]
+        public OrcWriteSettings FormatSettings { get; set; }
+
     }
 }
diff --git a/sdk/datafactory/Microsoft.Azure.Management.DataFactory/src/Generated/Models/OrcWriteSettings.cs b/sdk/datafactory/Microsoft.Azure.Management.DataFactory/src/Generated/Models/OrcWriteSettings.cs
new file mode 100644
index 000000000000..3dd01eab7727
--- /dev/null
+++ b/sdk/datafactory/Microsoft.Azure.Management.DataFactory/src/Generated/Models/OrcWriteSettings.cs
@@ -0,0 +1,74 @@
+// <auto-generated>
+// Copyright (c) Microsoft Corporation. All rights reserved.
+// Licensed under the MIT License. See License.txt in the project root for
+// license information.
+//
+// Code generated by Microsoft (R) AutoRest Code Generator.
+// Changes may cause incorrect behavior and will be lost if the code is
+// regenerated.
+// </auto-generated>
+
+namespace Microsoft.Azure.Management.DataFactory.Models
+{
+    using Newtonsoft.Json;
+    using System.Collections;
+    using System.Collections.Generic;
+    using System.Linq;
+
+    /// <summary>
+    /// Orc write settings.
+    /// </summary>
+    public partial class OrcWriteSettings : FormatWriteSettings
+    {
+        /// <summary>
+        /// Initializes a new instance of the OrcWriteSettings class.
+        /// </summary>
+        public OrcWriteSettings()
+        {
+            CustomInit();
+        }
+
+        /// <summary>
+        /// Initializes a new instance of the OrcWriteSettings class.
+        /// </summary>
+        /// <param name="additionalProperties">Unmatched properties from the
+        /// message are deserialized this collection</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>
+        public OrcWriteSettings(IDictionary<string, object> additionalProperties = default(IDictionary<string, object>), object maxRowsPerFile = default(object), object fileNamePrefix = default(object))
+            : base(additionalProperties)
+        {
+            MaxRowsPerFile = maxRowsPerFile;
+            FileNamePrefix = fileNamePrefix;
+            CustomInit();
+        }
+
+        /// <summary>
+        /// An initialization method that performs custom operations like setting defaults
+        /// </summary>
+        partial void CustomInit();
+
+        /// <summary>
+        /// Gets or sets limit the written file's row count to be smaller than
+        /// or equal to the specified count. Type: integer (or Expression with
+        /// resultType integer).
+        /// </summary>
+        [JsonProperty(PropertyName = "maxRowsPerFile")]
+        public object MaxRowsPerFile { get; set; }
+
+        /// <summary>
+        /// Gets or sets specifies the file name pattern
+        /// &amp;lt;fileNamePrefix&amp;gt;_&amp;lt;fileIndex&amp;gt;.&amp;lt;fileExtension&amp;gt;
+        /// when copy from non-file based store without partitionOptions. Type:
+        /// string (or Expression with resultType string).
+        /// </summary>
+        [JsonProperty(PropertyName = "fileNamePrefix")]
+        public object FileNamePrefix { get; set; }
+
+    }
+}
diff --git a/sdk/datafactory/Microsoft.Azure.Management.DataFactory/src/Generated/Models/ParquetSink.cs b/sdk/datafactory/Microsoft.Azure.Management.DataFactory/src/Generated/Models/ParquetSink.cs
index 67b95379fe09..5873985de449 100644
--- a/sdk/datafactory/Microsoft.Azure.Management.DataFactory/src/Generated/Models/ParquetSink.cs
+++ b/sdk/datafactory/Microsoft.Azure.Management.DataFactory/src/Generated/Models/ParquetSink.cs
@@ -47,10 +47,12 @@ public ParquetSink()
         /// connection count for the sink data store. Type: integer (or
         /// Expression with resultType integer).</param>
         /// <param name="storeSettings">Parquet store settings.</param>
-        public ParquetSink(IDictionary<string, object> additionalProperties = default(IDictionary<string, object>), object writeBatchSize = default(object), object writeBatchTimeout = default(object), object sinkRetryCount = default(object), object sinkRetryWait = default(object), object maxConcurrentConnections = default(object), StoreWriteSettings storeSettings = default(StoreWriteSettings))
+        /// <param name="formatSettings">Parquet format settings.</param>
+        public ParquetSink(IDictionary<string, object> additionalProperties = default(IDictionary<string, object>), object writeBatchSize = default(object), object writeBatchTimeout = default(object), object sinkRetryCount = default(object), object sinkRetryWait = default(object), object maxConcurrentConnections = default(object), StoreWriteSettings storeSettings = default(StoreWriteSettings), ParquetWriteSettings formatSettings = default(ParquetWriteSettings))
             : base(additionalProperties, writeBatchSize, writeBatchTimeout, sinkRetryCount, sinkRetryWait, maxConcurrentConnections)
         {
             StoreSettings = storeSettings;
+            FormatSettings = formatSettings;
             CustomInit();
         }
 
@@ -65,5 +67,11 @@ public ParquetSink()
         [JsonProperty(PropertyName = "storeSettings")]
         public StoreWriteSettings StoreSettings { get; set; }
 
+        /// <summary>
+        /// Gets or sets parquet format settings.
+        /// </summary>
+        [JsonProperty(PropertyName = "formatSettings")]
+        public ParquetWriteSettings FormatSettings { get; set; }
+
     }
 }
diff --git a/sdk/datafactory/Microsoft.Azure.Management.DataFactory/src/Generated/Models/ParquetWriteSettings.cs b/sdk/datafactory/Microsoft.Azure.Management.DataFactory/src/Generated/Models/ParquetWriteSettings.cs
new file mode 100644
index 000000000000..5204159ed3aa
--- /dev/null
+++ b/sdk/datafactory/Microsoft.Azure.Management.DataFactory/src/Generated/Models/ParquetWriteSettings.cs
@@ -0,0 +1,74 @@
+// <auto-generated>
+// Copyright (c) Microsoft Corporation. All rights reserved.
+// Licensed under the MIT License. See License.txt in the project root for
+// license information.
+//
+// Code generated by Microsoft (R) AutoRest Code Generator.
+// Changes may cause incorrect behavior and will be lost if the code is
+// regenerated.
+// </auto-generated>
+
+namespace Microsoft.Azure.Management.DataFactory.Models
+{
+    using Newtonsoft.Json;
+    using System.Collections;
+    using System.Collections.Generic;
+    using System.Linq;
+
+    /// <summary>
+    /// Parquet write settings.
+    /// </summary>
+    public partial class ParquetWriteSettings : FormatWriteSettings
+    {
+        /// <summary>
+        /// Initializes a new instance of the ParquetWriteSettings class.
+        /// </summary>
+        public ParquetWriteSettings()
+        {
+            CustomInit();
+        }
+
+        /// <summary>
+        /// Initializes a new instance of the ParquetWriteSettings class.
+        /// </summary>
+        /// <param name="additionalProperties">Unmatched properties from the
+        /// message are deserialized this collection</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>
+        public ParquetWriteSettings(IDictionary<string, object> additionalProperties = default(IDictionary<string, object>), object maxRowsPerFile = default(object), object fileNamePrefix = default(object))
+            : base(additionalProperties)
+        {
+            MaxRowsPerFile = maxRowsPerFile;
+            FileNamePrefix = fileNamePrefix;
+            CustomInit();
+        }
+
+        /// <summary>
+        /// An initialization method that performs custom operations like setting defaults
+        /// </summary>
+        partial void CustomInit();
+
+        /// <summary>
+        /// Gets or sets limit the written file's row count to be smaller than
+        /// or equal to the specified count. Type: integer (or Expression with
+        /// resultType integer).
+        /// </summary>
+        [JsonProperty(PropertyName = "maxRowsPerFile")]
+        public object MaxRowsPerFile { get; set; }
+
+        /// <summary>
+        /// Gets or sets specifies the file name pattern
+        /// &amp;lt;fileNamePrefix&amp;gt;_&amp;lt;fileIndex&amp;gt;.&amp;lt;fileExtension&amp;gt;
+        /// when copy from non-file based store without partitionOptions. Type:
+        /// string (or Expression with resultType string).
+        /// </summary>
+        [JsonProperty(PropertyName = "fileNamePrefix")]
+        public object FileNamePrefix { get; set; }
+
+    }
+}
diff --git a/sdk/datafactory/Microsoft.Azure.Management.DataFactory/src/Extensions/TabularTranslator.cs b/sdk/datafactory/Microsoft.Azure.Management.DataFactory/src/Generated/Models/TabularTranslator.cs
similarity index 56%
rename from sdk/datafactory/Microsoft.Azure.Management.DataFactory/src/Extensions/TabularTranslator.cs
rename to sdk/datafactory/Microsoft.Azure.Management.DataFactory/src/Generated/Models/TabularTranslator.cs
index c15d50bf35d1..b7f33e452c19 100644
--- a/sdk/datafactory/Microsoft.Azure.Management.DataFactory/src/Extensions/TabularTranslator.cs
+++ b/sdk/datafactory/Microsoft.Azure.Management.DataFactory/src/Generated/Models/TabularTranslator.cs
@@ -10,8 +10,10 @@
 
 namespace Microsoft.Azure.Management.DataFactory.Models
 {
-    using System.Collections.Generic;
     using Newtonsoft.Json;
+    using System.Collections;
+    using System.Collections.Generic;
+    using System.Linq;
 
     /// <summary>
     /// A copy activity tabular translator.
@@ -33,36 +35,41 @@ public TabularTranslator()
         /// message are deserialized this collection</param>
         /// <param name="columnMappings">Column mappings. Example: "UserId:
         /// MyUserId, Group: MyGroup, Name: MyName" Type: string (or Expression
-        /// with resultType string).</param>
+        /// with resultType string). This property will be retired. Please use
+        /// mappings property.</param>
         /// <param name="schemaMapping">The schema mapping to map between
         /// tabular data and hierarchical data. Example: {"Column1":
         /// "$.Column1", "Column2": "$.Column2.Property1", "Column3":
         /// "$.Column2.Property2"}. Type: object (or Expression with resultType
-        /// object).</param>
+        /// object). This property will be retired. Please use mappings
+        /// property.</param>
         /// <param name="collectionReference">The JSON Path of the Nested Array
         /// that is going to do cross-apply. Type: object (or Expression with
         /// resultType object).</param>
+        /// <param name="mapComplexValuesToString">Whether to map complex
+        /// (array and object) values to simple strings in json format. Type:
+        /// boolean (or Expression with resultType boolean).</param>
         /// <param name="mappings">Column mappings with logical types.
-        /// Tabular->tabular example: [{\"source\":{\"name\":\"CustomerName\",
-        /// \"type\":\"String\"},\"sink\":{\"name\":\"ClientName\",\"type\":\"
-        /// String\"}},{\"source\":{\"name\":\"CustomerAddress\",\"type\":\"
-        /// String\"},\"sink\":{\"name\":\"ClientAddress\",\"type\":\"String\"}}].
-        /// Hierarchical->tabular example: [{\"source\":{\"path\":\"$.CustomerName\",
-        /// \"type\":\"String\"},\"sink\":{\"name\":\"ClientName\",\"type\":\"String\"}},
-        /// {\"source\":{\"path\":\"$.CustomerAddress\",\"type\":\"String\"},\"sink\":
-        /// {\"name\":\"ClientAddress\",\"type\":\"String\"}}]. Type: object 
-        /// (or Expression with resultType object).</param>
-        /// <param name="typeConversion">Whether to enable the advanced type conversion
-        /// feature in the Copy activity. Type: boolean (or Expression with resultType
-        /// boolean).</param>
-        /// <param name="typeConversionSettings">Type conversion settings</param>
-        public TabularTranslator(IDictionary<string, object> additionalProperties = default(IDictionary<string, object>), object columnMappings = default(object), object schemaMapping = default(object), object collectionReference = default(object), object mappings = default(object), object typeConversion = default(object), TypeConversionSettings typeConversionSettings = default(TypeConversionSettings))
+        /// Tabular-&gt;tabular example:
+        /// [{"source":{"name":"CustomerName","type":"String"},"sink":{"name":"ClientName","type":"String"}},{"source":{"name":"CustomerAddress","type":"String"},"sink":{"name":"ClientAddress","type":"String"}}].
+        /// Hierarchical-&gt;tabular example:
+        /// [{"source":{"path":"$.CustomerName","type":"String"},"sink":{"name":"ClientName","type":"String"}},{"source":{"path":"$.CustomerAddress","type":"String"},"sink":{"name":"ClientAddress","type":"String"}}].
+        /// Type: object (or Expression with resultType object).</param>
+        /// <param name="typeConversion">Whether to enable the advanced type
+        /// conversion feature in the Copy activity. Type: boolean (or
+        /// Expression with resultType boolean).</param>
+        /// <param name="typeConversionSettings">Type conversion
+        /// settings</param>
+        public TabularTranslator(IDictionary<string, object> additionalProperties = default(IDictionary<string, object>), object columnMappings = default(object), object schemaMapping = default(object), object collectionReference = default(object), object mapComplexValuesToString = default(object), object mappings = default(object), object typeConversion = default(object), TypeConversionSettings typeConversionSettings = default(TypeConversionSettings))
             : base(additionalProperties)
         {
             ColumnMappings = columnMappings;
             SchemaMapping = schemaMapping;
             CollectionReference = collectionReference;
+            MapComplexValuesToString = mapComplexValuesToString;
             Mappings = mappings;
+            TypeConversion = typeConversion;
+            TypeConversionSettings = typeConversionSettings;
             CustomInit();
         }
 
@@ -72,9 +79,10 @@ public TabularTranslator()
         partial void CustomInit();
 
         /// <summary>
-        /// Gets or sets column mappings. Example: "UserId: MyUserId, Group: 
+        /// Gets or sets column mappings. Example: "UserId: MyUserId, Group:
         /// MyGroup, Name: MyName" Type: string (or Expression with resultType
-        /// string).
+        /// string). This property will be retired. Please use mappings
+        /// property.
         /// </summary>
         [JsonProperty(PropertyName = "columnMappings")]
         public object ColumnMappings { get; set; }
@@ -83,7 +91,8 @@ public TabularTranslator()
         /// Gets or sets the schema mapping to map between tabular data and
         /// hierarchical data. Example: {"Column1": "$.Column1", "Column2":
         /// "$.Column2.Property1", "Column3": "$.Column2.Property2"}. Type:
-        /// object (or Expression with resultType object).
+        /// object (or Expression with resultType object). This property will
+        /// be retired. Please use mappings property.
         /// </summary>
         [JsonProperty(PropertyName = "schemaMapping")]
         public object SchemaMapping { get; set; }
@@ -96,31 +105,37 @@ public TabularTranslator()
         public object CollectionReference { get; set; }
 
         /// <summary>
-        /// Gets or sets the column mappings with logical types.
-        /// Tabular->tabular example: [{\"source\":{\"name\":\"CustomerName\",
-        /// \"type\":\"String\"},\"sink\":{\"name\":\"ClientName\",\"type\":\"
-        /// String\"}},{\"source\":{\"name\":\"CustomerAddress\",\"type\":\"
-        /// String\"},\"sink\":{\"name\":\"ClientAddress\",\"type\":\"String\"}}].
-        /// Hierarchical->tabular example: [{\"source\":{\"path\":\"$.CustomerName\",
-        /// \"type\":\"String\"},\"sink\":{\"name\":\"ClientName\",\"type\":\"String\"}},
-        /// {\"source\":{\"path\":\"$.CustomerAddress\",\"type\":\"String\"},\"sink\":
-        /// {\"name\":\"ClientAddress\",\"type\":\"String\"}}]. Type: object 
-        /// (or Expression with resultType object).
+        /// Gets or sets whether to map complex (array and object) values to
+        /// simple strings in json format. Type: boolean (or Expression with
+        /// resultType boolean).
+        /// </summary>
+        [JsonProperty(PropertyName = "mapComplexValuesToString")]
+        public object MapComplexValuesToString { get; set; }
+
+        /// <summary>
+        /// Gets or sets column mappings with logical types.
+        /// Tabular-&amp;gt;tabular example:
+        /// [{"source":{"name":"CustomerName","type":"String"},"sink":{"name":"ClientName","type":"String"}},{"source":{"name":"CustomerAddress","type":"String"},"sink":{"name":"ClientAddress","type":"String"}}].
+        /// Hierarchical-&amp;gt;tabular example:
+        /// [{"source":{"path":"$.CustomerName","type":"String"},"sink":{"name":"ClientName","type":"String"}},{"source":{"path":"$.CustomerAddress","type":"String"},"sink":{"name":"ClientAddress","type":"String"}}].
+        /// Type: object (or Expression with resultType object).
         /// </summary>
         [JsonProperty(PropertyName = "mappings")]
         public object Mappings { get; set; }
 
         /// <summary>
-        /// Gets or sets typeConversion indicating whether to enable the advanced type conversion
-        /// feature in the Copy activity. Type: boolean (or Expression with resultType boolean).
+        /// Gets or sets whether to enable the advanced type conversion feature
+        /// in the Copy activity. Type: boolean (or Expression with resultType
+        /// boolean).
         /// </summary>
         [JsonProperty(PropertyName = "typeConversion")]
         public object TypeConversion { get; set; }
 
         /// <summary>
-        /// Gets or sets typeConversionSettings.
+        /// Gets or sets type conversion settings
         /// </summary>
         [JsonProperty(PropertyName = "typeConversionSettings")]
         public TypeConversionSettings TypeConversionSettings { get; set; }
+
     }
 }
diff --git a/sdk/datafactory/Microsoft.Azure.Management.DataFactory/src/Extensions/TypeConversionSettings.cs b/sdk/datafactory/Microsoft.Azure.Management.DataFactory/src/Generated/Models/TypeConversionSettings.cs
similarity index 59%
rename from sdk/datafactory/Microsoft.Azure.Management.DataFactory/src/Extensions/TypeConversionSettings.cs
rename to sdk/datafactory/Microsoft.Azure.Management.DataFactory/src/Generated/Models/TypeConversionSettings.cs
index 02c57496faa8..57c7aa987dbe 100644
--- a/sdk/datafactory/Microsoft.Azure.Management.DataFactory/src/Extensions/TypeConversionSettings.cs
+++ b/sdk/datafactory/Microsoft.Azure.Management.DataFactory/src/Generated/Models/TypeConversionSettings.cs
@@ -1,4 +1,4 @@
-// <auto-generated>
+// <auto-generated>
 // Copyright (c) Microsoft Corporation. All rights reserved.
 // Licensed under the MIT License. See License.txt in the project root for
 // license information.
@@ -8,12 +8,14 @@
 // regenerated.
 // </auto-generated>
 
-
 namespace Microsoft.Azure.Management.DataFactory.Models
 {
-    using System.Collections.Generic;
     using Newtonsoft.Json;
+    using System.Linq;
 
+    /// <summary>
+    /// Type conversion settings
+    /// </summary>
     public partial class TypeConversionSettings
     {
         /// <summary>
@@ -27,17 +29,25 @@ public TypeConversionSettings()
         /// <summary>
         /// Initializes a new instance of the TypeConversionSettings class.
         /// </summary>
-        /// <param name="additionalProperties">Unmatched properties from the message are deserialized this collection</param>
-        /// <param name="allowDataTruncation">Whether to allow data truncation when converting the data. Type: boolean (or Expression with resultType boolean).</param>
-        /// <param name="treatBooleanAsNumber">Whether to treat boolean values as numbers. Type: boolean (or Expression with resultType boolean).</param>
-        /// <param name="dateTimeFormat">The format for DateTime values. Type: string (or Expression with resultType string).</param>
-        /// <param name="dateTimeOffsetFormat">The format for DateTimeOffset values. Type: string (or Expression with resultType string).</param>
-        /// <param name="timeSpanFormat">The format for TimeSpan values. Type: string (or Expression with resultType string).</param>
-        /// <param name="culture">The culture used to convert data from/to string. Type: string (or Expression with resultType string).</param>
-        public TypeConversionSettings(IDictionary<string, object> additionalProperties = default(IDictionary<string, object>), object allowDataTruncation = default(object), object treatBooleanAsNumber = default(object), object dateTimeFormat = default(object), object dateTimeOffsetFormat = default(object), object timeSpanFormat = default(object), object culture = default(object))
+        /// <param name="allowDataTruncation">Whether to allow data truncation
+        /// when converting the data. Type: boolean (or Expression with
+        /// resultType boolean).</param>
+        /// <param name="treatBooleanAsNumber">Whether to treat boolean values
+        /// as numbers. Type: boolean (or Expression with resultType
+        /// boolean).</param>
+        /// <param name="dateTimeFormat">The format for DateTime values. Type:
+        /// string (or Expression with resultType string).</param>
+        /// <param name="dateTimeOffsetFormat">The format for DateTimeOffset
+        /// values. Type: string (or Expression with resultType
+        /// string).</param>
+        /// <param name="timeSpanFormat">The format for TimeSpan values. Type:
+        /// string (or Expression with resultType string).</param>
+        /// <param name="culture">The culture used to convert data from/to
+        /// string. Type: string (or Expression with resultType
+        /// string).</param>
+        public TypeConversionSettings(object allowDataTruncation = default(object), object treatBooleanAsNumber = default(object), object dateTimeFormat = default(object), object dateTimeOffsetFormat = default(object), object timeSpanFormat = default(object), object culture = default(object))
         {
-            AdditionalProperties = additionalProperties;
-            AllowDataTruncation = AllowDataTruncation;
+            AllowDataTruncation = allowDataTruncation;
             TreatBooleanAsNumber = treatBooleanAsNumber;
             DateTimeFormat = dateTimeFormat;
             DateTimeOffsetFormat = dateTimeOffsetFormat;
@@ -52,46 +62,46 @@ public TypeConversionSettings()
         partial void CustomInit();
 
         /// <summary>
-        /// Gets or sets unmatched properties from the message are deserialized
-        /// this collection
-        /// </summary>
-        [JsonExtensionData]
-        public IDictionary<string, object> AdditionalProperties { get; set; }
-
-        /// <summary>
-        /// Gets or sets allowDataTruncation indicating whether to allow data truncation when converting the data. Type: boolean (or Expression with resultType boolean).
+        /// Gets or sets whether to allow data truncation when converting the
+        /// data. Type: boolean (or Expression with resultType boolean).
         /// </summary>
         [JsonProperty(PropertyName = "allowDataTruncation")]
         public object AllowDataTruncation { get; set; }
 
         /// <summary>
-        /// Gets or sets treatBooleanAsNumber indicating whether to treat boolean values as numbers. Type: boolean (or Expression with resultType boolean).
+        /// Gets or sets whether to treat boolean values as numbers. Type:
+        /// boolean (or Expression with resultType boolean).
         /// </summary>
         [JsonProperty(PropertyName = "treatBooleanAsNumber")]
         public object TreatBooleanAsNumber { get; set; }
 
         /// <summary>
-        /// Gets or sets the format for DateTime values. Type: string (or Expression with resultType string).
+        /// Gets or sets the format for DateTime values. Type: string (or
+        /// Expression with resultType string).
         /// </summary>
         [JsonProperty(PropertyName = "dateTimeFormat")]
         public object DateTimeFormat { get; set; }
 
         /// <summary>
-        /// Gets or sets the format for DateTimeOffset values. Type: string (or Expression with resultType string).
+        /// Gets or sets the format for DateTimeOffset values. Type: string (or
+        /// Expression with resultType string).
         /// </summary>
         [JsonProperty(PropertyName = "dateTimeOffsetFormat")]
         public object DateTimeOffsetFormat { get; set; }
 
         /// <summary>
-        /// Gets or sets the format for TimeSpan values. Type: string (or Expression with resultType string).
+        /// Gets or sets the format for TimeSpan values. Type: string (or
+        /// Expression with resultType string).
         /// </summary>
         [JsonProperty(PropertyName = "timeSpanFormat")]
         public object TimeSpanFormat { get; set; }
 
         /// <summary>
-        /// Gets or sets the culture used to convert data from/to string. Type: string (or Expression with resultType string).
+        /// Gets or sets the culture used to convert data from/to string. Type:
+        /// string (or Expression with resultType string).
         /// </summary>
         [JsonProperty(PropertyName = "culture")]
         public object Culture { get; set; }
+
     }
 }
diff --git a/sdk/datafactory/Microsoft.Azure.Management.DataFactory/src/Microsoft.Azure.Management.DataFactory.csproj b/sdk/datafactory/Microsoft.Azure.Management.DataFactory/src/Microsoft.Azure.Management.DataFactory.csproj
index fdd9b23a1107..983c1fcf8dec 100644
--- a/sdk/datafactory/Microsoft.Azure.Management.DataFactory/src/Microsoft.Azure.Management.DataFactory.csproj
+++ b/sdk/datafactory/Microsoft.Azure.Management.DataFactory/src/Microsoft.Azure.Management.DataFactory.csproj
@@ -12,6 +12,7 @@
   <![CDATA[
 - Added logLevel/enableReliableLogging to LogStorageSettings
 - Support Tar GZip compression type in Data Factory
+- Added maxRowPerFile/fileNamePrefix to tabular format settings
   ]]></PackageReleaseNotes>
   </PropertyGroup>
   <PropertyGroup>