diff --git a/generator/ServiceClientGeneratorLib/ServiceModel.cs b/generator/ServiceClientGeneratorLib/ServiceModel.cs
index e077511bab60..5d0a63188b3b 100644
--- a/generator/ServiceClientGeneratorLib/ServiceModel.cs
+++ b/generator/ServiceClientGeneratorLib/ServiceModel.cs
@@ -573,7 +573,8 @@ public List<Operation> S3AllowListOperations
                         new Operation(this, "DeleteBucketIntelligentTieringConfiguration", DocumentRoot[OperationsKey]["DeleteBucketIntelligentTieringConfiguration"]),
                         new Operation(this, "DeleteBucketInventoryConfiguration", DocumentRoot[OperationsKey]["DeleteBucketInventoryConfiguration"]),
                         new Operation(this,"PutBucketRequestPayment", DocumentRoot[OperationsKey]["PutBucketRequestPayment"]),
-                        new Operation(this, "CreateBucketMetadataConfiguration",DocumentRoot[OperationsKey]["CreateBucketMetadataConfiguration"])
+                        new Operation(this, "CreateBucketMetadataConfiguration",DocumentRoot[OperationsKey]["CreateBucketMetadataConfiguration"]),
+                        new Operation(this, "GetBucketMetadataConfiguration", DocumentRoot[OperationsKey]["GetBucketMetadataConfiguration"])
 
                     };
                 }
@@ -604,7 +605,8 @@ public List<string> S3RequestMarshallerThrowGenericExceptionList
                         "PutObjectAcl",
                         "GetObjectAcl",
                         "PutBucketAcl",
-                        "CreateBucketMetadataConfiguration"
+                        "CreateBucketMetadataConfiguration",
+                        "GetBucketMetadataConfiguration"
                     };
                 }
                 return _s3RequestMarshallerThrowAmazonS3ExceptionList;
diff --git a/generator/ServiceModels/s3/s3.customizations.json b/generator/ServiceModels/s3/s3.customizations.json
index 0acc7070cf86..b241f9a605a7 100644
--- a/generator/ServiceModels/s3/s3.customizations.json
+++ b/generator/ServiceModels/s3/s3.customizations.json
@@ -1207,6 +1207,16 @@
                     "KmsKeyArn":{"injectXmlIsSet":["return !String.IsNullOrEmpty(this._kmsKeyArn);"]}
                 }
             ]
+        },
+        "GetBucketMetadataConfigurationRequest":{
+            "modify":[
+                {
+                    "BucketName":{"injectXmlIsSet":["return !String.IsNullOrEmpty(this._bucketName);"]}
+                },
+                {
+                    "ExpectedBucketOwner":{"injectXmlIsSet":["return !String.IsNullOrEmpty(this._expectedBucketOwner);"]}
+                }
+            ]
         }
         
     },
diff --git a/sdk/src/Services/S3/Custom/Model/GetBucketMetadataConfigurationRequest.cs b/sdk/src/Services/S3/Custom/Model/GetBucketMetadataConfigurationRequest.cs
deleted file mode 100644
index 2eb99b73892e..000000000000
--- a/sdk/src/Services/S3/Custom/Model/GetBucketMetadataConfigurationRequest.cs
+++ /dev/null
@@ -1,69 +0,0 @@
-/*
- * Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
- * 
- * Licensed under the Apache License, Version 2.0 (the "License").
- * You may not use this file except in compliance with the License.
- * A copy of the License is located at
- * 
- *  http://aws.amazon.com/apache2.0
- * 
- * or in the "license" file accompanying this file. This file is distributed
- * on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either
- * express or implied. See the License for the specific language governing
- * permissions and limitations under the License.
- */
-
-using System;
-using System.Collections.Generic;
-using System.Xml.Serialization;
-using System.Text;
-using System.IO;
-using System.Net;
-
-using Amazon.Runtime;
-using Amazon.Runtime.Internal;
-
-#pragma warning disable CS0612,CS0618,CS1570
-namespace Amazon.S3.Model
-{
-    /// <summary>
-    /// Container for the parameters to the GetBucketMetadataConfiguration operation.
-    /// 
-    /// </summary>
-    public partial class GetBucketMetadataConfigurationRequest : AmazonWebServiceRequest
-    {
-        private string bucketName;
-        private string expectedBucketOwner;
-
-        /// <summary>
-        /// Gets and sets the property BucketName.
-        /// </summary>
-        public string BucketName
-        {
-            get { return this.bucketName; }
-            set { this.bucketName = value; }
-        }
-
-        // Check to see if BucketName property is set
-        internal bool IsSetBucketName()
-        {
-            return !String.IsNullOrEmpty(this.bucketName);
-        }
-
-        /// <summary>
-        /// Gets and sets the property ExpectedBucketOwner.
-        /// </summary>
-        public string ExpectedBucketOwner
-        {
-            get { return this.expectedBucketOwner; }
-            set { this.expectedBucketOwner = value; }
-        }
-
-        // Check to see if ExpectedBucketOwner property is set
-        internal bool IsSetExpectedBucketOwner()
-        {
-            return !String.IsNullOrEmpty(this.expectedBucketOwner);
-        }
-
-    }
-}
\ No newline at end of file
diff --git a/sdk/src/Services/S3/Custom/Model/DestinationResult.cs b/sdk/src/Services/S3/Generated/Model/DestinationResult.cs
similarity index 100%
rename from sdk/src/Services/S3/Custom/Model/DestinationResult.cs
rename to sdk/src/Services/S3/Generated/Model/DestinationResult.cs
diff --git a/sdk/src/Services/S3/Generated/Model/GetBucketMetadataConfigurationRequest.cs b/sdk/src/Services/S3/Generated/Model/GetBucketMetadataConfigurationRequest.cs
new file mode 100644
index 000000000000..1f7a7207d0e3
--- /dev/null
+++ b/sdk/src/Services/S3/Generated/Model/GetBucketMetadataConfigurationRequest.cs
@@ -0,0 +1,133 @@
+/*
+ * Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ * 
+ * Licensed under the Apache License, Version 2.0 (the "License").
+ * You may not use this file except in compliance with the License.
+ * A copy of the License is located at
+ * 
+ *  http://aws.amazon.com/apache2.0
+ * 
+ * or in the "license" file accompanying this file. This file is distributed
+ * on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either
+ * express or implied. See the License for the specific language governing
+ * permissions and limitations under the License.
+ */
+
+/*
+ * Do not modify this file. This file is generated from the s3-2006-03-01.normal.json service model.
+ */
+using System;
+using System.Collections.Generic;
+using System.Xml.Serialization;
+using System.Text;
+using System.IO;
+using System.Net;
+
+using Amazon.Runtime;
+using Amazon.Runtime.Internal;
+
+#pragma warning disable CS0612,CS0618,CS1570
+namespace Amazon.S3.Model
+{
+    /// <summary>
+    /// Container for the parameters to the GetBucketMetadataConfiguration operation.
+    /// Retrieves the S3 Metadata configuration for a general purpose bucket. For more information,
+    /// see <a href="https://docs.aws.amazon.com/AmazonS3/latest/userguide/metadata-tables-overview.html">Accelerating
+    /// data discovery with S3 Metadata</a> in the <i>Amazon S3 User Guide</i>. 
+    /// 
+    ///  <note> 
+    /// <para>
+    /// You can use the V2 <c>GetBucketMetadataConfiguration</c> API operation with V1 or
+    /// V2 metadata configurations. However, if you try to use the V1 <c>GetBucketMetadataTableConfiguration</c>
+    /// API operation with V2 configurations, you will receive an HTTP <c>405 Method Not Allowed</c>
+    /// error.
+    /// </para>
+    ///  </note> <dl> <dt>Permissions</dt> <dd> 
+    /// <para>
+    /// To use this operation, you must have the <c>s3:GetBucketMetadataTableConfiguration</c>
+    /// permission. For more information, see <a href="https://docs.aws.amazon.com/AmazonS3/latest/userguide/metadata-tables-permissions.html">Setting
+    /// up permissions for configuring metadata tables</a> in the <i>Amazon S3 User Guide</i>.
+    /// 
+    /// </para>
+    ///  <note> 
+    /// <para>
+    /// The IAM policy action name is the same for the V1 and V2 API operations.
+    /// </para>
+    ///  </note> </dd> </dl> 
+    /// <para>
+    /// The following operations are related to <c>GetBucketMetadataConfiguration</c>:
+    /// </para>
+    ///  <ul> <li> 
+    /// <para>
+    ///  <a href="https://docs.aws.amazon.com/AmazonS3/latest/API/API_CreateBucketMetadataConfiguration.html">CreateBucketMetadataConfiguration</a>
+    /// 
+    /// </para>
+    ///  </li> <li> 
+    /// <para>
+    ///  <a href="https://docs.aws.amazon.com/AmazonS3/latest/API/API_DeleteBucketMetadataConfiguration.html">DeleteBucketMetadataConfiguration</a>
+    /// 
+    /// </para>
+    ///  </li> <li> 
+    /// <para>
+    ///  <a href="https://docs.aws.amazon.com/AmazonS3/latest/API/API_UpdateBucketMetadataInventoryTableConfiguration.html">UpdateBucketMetadataInventoryTableConfiguration</a>
+    /// 
+    /// </para>
+    ///  </li> <li> 
+    /// <para>
+    ///  <a href="https://docs.aws.amazon.com/AmazonS3/latest/API/API_UpdateBucketMetadataJournalTableConfiguration.html">UpdateBucketMetadataJournalTableConfiguration</a>
+    /// 
+    /// </para>
+    ///  </li> </ul> <important> 
+    /// <para>
+    /// You must URL encode any signed header values that contain spaces. For example, if
+    /// your header value is <c>my file.txt</c>, containing two spaces after <c>my</c>, you
+    /// must URL encode this value to <c>my%20%20file.txt</c>.
+    /// </para>
+    ///  </important>
+    /// </summary>
+    public partial class GetBucketMetadataConfigurationRequest : AmazonWebServiceRequest
+    {
+        private string _bucketName;
+        private string _expectedBucketOwner;
+
+        /// <summary>
+        /// Gets and sets the property BucketName. 
+        /// <para>
+        ///  The general purpose bucket that corresponds to the metadata configuration that you
+        /// want to retrieve. 
+        /// </para>
+        /// </summary>
+        [AWSProperty(Required=true)]
+        public string BucketName
+        {
+            get { return this._bucketName; }
+            set { this._bucketName = value; }
+        }
+
+        // Check to see if BucketName property is set
+        internal bool IsSetBucketName()
+        {
+            return !String.IsNullOrEmpty(this._bucketName);
+        }
+
+        /// <summary>
+        /// Gets and sets the property ExpectedBucketOwner. 
+        /// <para>
+        ///  The expected owner of the general purpose bucket that you want to retrieve the metadata
+        /// table configuration for. 
+        /// </para>
+        /// </summary>
+        public string ExpectedBucketOwner
+        {
+            get { return this._expectedBucketOwner; }
+            set { this._expectedBucketOwner = value; }
+        }
+
+        // Check to see if ExpectedBucketOwner property is set
+        internal bool IsSetExpectedBucketOwner()
+        {
+            return !String.IsNullOrEmpty(this._expectedBucketOwner);
+        }
+
+    }
+}
\ No newline at end of file
diff --git a/sdk/src/Services/S3/Custom/Model/GetBucketMetadataConfigurationResponse.cs b/sdk/src/Services/S3/Generated/Model/GetBucketMetadataConfigurationResponse.cs
similarity index 93%
rename from sdk/src/Services/S3/Custom/Model/GetBucketMetadataConfigurationResponse.cs
rename to sdk/src/Services/S3/Generated/Model/GetBucketMetadataConfigurationResponse.cs
index 7a6a549e1f73..4de7b771bbb8 100644
--- a/sdk/src/Services/S3/Custom/Model/GetBucketMetadataConfigurationResponse.cs
+++ b/sdk/src/Services/S3/Generated/Model/GetBucketMetadataConfigurationResponse.cs
@@ -37,7 +37,10 @@ public partial class GetBucketMetadataConfigurationResponse : AmazonWebServiceRe
         private GetBucketMetadataConfigurationResult _getBucketMetadataConfigurationResult;
 
         /// <summary>
-        /// Gets and sets the property GetBucketMetadataConfigurationResult.
+        /// Gets and sets the property GetBucketMetadataConfigurationResult. 
+        /// <para>
+        ///  The metadata configuration for the general purpose bucket. 
+        /// </para>
         /// </summary>
         public GetBucketMetadataConfigurationResult GetBucketMetadataConfigurationResult
         {
diff --git a/sdk/src/Services/S3/Custom/Model/GetBucketMetadataConfigurationResult.cs b/sdk/src/Services/S3/Generated/Model/GetBucketMetadataConfigurationResult.cs
similarity index 90%
rename from sdk/src/Services/S3/Custom/Model/GetBucketMetadataConfigurationResult.cs
rename to sdk/src/Services/S3/Generated/Model/GetBucketMetadataConfigurationResult.cs
index 46cccd9cc928..ad6c72fcfc48 100644
--- a/sdk/src/Services/S3/Custom/Model/GetBucketMetadataConfigurationResult.cs
+++ b/sdk/src/Services/S3/Generated/Model/GetBucketMetadataConfigurationResult.cs
@@ -30,14 +30,17 @@
 namespace Amazon.S3.Model
 {
     /// <summary>
-    /// 
+    /// The S3 Metadata configuration for a general purpose bucket.
     /// </summary>
     public partial class GetBucketMetadataConfigurationResult
     {
         private MetadataConfigurationResult _metadataConfigurationResult;
 
         /// <summary>
-        /// Gets and sets the property MetadataConfigurationResult.
+        /// Gets and sets the property MetadataConfigurationResult. 
+        /// <para>
+        ///  The metadata configuration for a general purpose bucket. 
+        /// </para>
         /// </summary>
         [AWSProperty(Required=true)]
         public MetadataConfigurationResult MetadataConfigurationResult
diff --git a/sdk/src/Services/S3/Custom/Model/Internal/MarshallTransformations/DestinationResultUnmarshaller.cs b/sdk/src/Services/S3/Generated/Model/Internal/MarshallTransformations/DestinationResultUnmarshaller.cs
similarity index 90%
rename from sdk/src/Services/S3/Custom/Model/Internal/MarshallTransformations/DestinationResultUnmarshaller.cs
rename to sdk/src/Services/S3/Generated/Model/Internal/MarshallTransformations/DestinationResultUnmarshaller.cs
index a7de8544cb44..044eefe73089 100644
--- a/sdk/src/Services/S3/Custom/Model/Internal/MarshallTransformations/DestinationResultUnmarshaller.cs
+++ b/sdk/src/Services/S3/Generated/Model/Internal/MarshallTransformations/DestinationResultUnmarshaller.cs
@@ -36,7 +36,7 @@ namespace Amazon.S3.Model.Internal.MarshallTransformations
     /// <summary>
     /// Response Unmarshaller for DestinationResult Object
     /// </summary>  
-    public class DestinationResultUnmarshaller : IXmlUnmarshaller<DestinationResult, XmlUnmarshallerContext>
+    public partial class DestinationResultUnmarshaller : IXmlUnmarshaller<DestinationResult, XmlUnmarshallerContext>
     {
         /// <summary>
         /// Unmarshaller the response from the service to the response class.
@@ -74,6 +74,8 @@ public DestinationResult Unmarshall(XmlUnmarshallerContext context)
                         unmarshalledObject.TableNamespace = unmarshaller.Unmarshall(context);
                         continue;
                     }
+
+                    XmlStructureUnmarshallCustomization(context, unmarshalledObject, targetDepth);
                 }
                 else if (context.IsEndElement && context.CurrentDepth < originalDepth)
                 {
@@ -83,6 +85,8 @@ public DestinationResult Unmarshall(XmlUnmarshallerContext context)
             return unmarshalledObject;
         }
 
+        partial void XmlStructureUnmarshallCustomization(XmlUnmarshallerContext context, DestinationResult unmarshalledObject, int targetDepth);
+
         private static DestinationResultUnmarshaller _instance = new DestinationResultUnmarshaller();        
 
         /// <summary>
diff --git a/sdk/src/Services/S3/Custom/Model/Internal/MarshallTransformations/GetBucketMetadataConfigurationRequestMarshaller.cs b/sdk/src/Services/S3/Generated/Model/Internal/MarshallTransformations/GetBucketMetadataConfigurationRequestMarshaller.cs
similarity index 82%
rename from sdk/src/Services/S3/Custom/Model/Internal/MarshallTransformations/GetBucketMetadataConfigurationRequestMarshaller.cs
rename to sdk/src/Services/S3/Generated/Model/Internal/MarshallTransformations/GetBucketMetadataConfigurationRequestMarshaller.cs
index f58276f2ea51..fd718a66cb8c 100644
--- a/sdk/src/Services/S3/Custom/Model/Internal/MarshallTransformations/GetBucketMetadataConfigurationRequestMarshaller.cs
+++ b/sdk/src/Services/S3/Generated/Model/Internal/MarshallTransformations/GetBucketMetadataConfigurationRequestMarshaller.cs
@@ -36,7 +36,7 @@ namespace Amazon.S3.Model.Internal.MarshallTransformations
     /// <summary>
     /// GetBucketMetadataConfiguration Request Marshaller
     /// </summary>       
-    public class GetBucketMetadataConfigurationRequestMarshaller : IMarshaller<IRequest, GetBucketMetadataConfigurationRequest> , IMarshaller<IRequest,AmazonWebServiceRequest>
+    public partial class GetBucketMetadataConfigurationRequestMarshaller : IMarshaller<IRequest, GetBucketMetadataConfigurationRequest> , IMarshaller<IRequest,AmazonWebServiceRequest>
     {
         /// <summary>
         /// Marshaller the request object to the HTTP request.
@@ -56,6 +56,7 @@ public IRequest Marshall(AmazonWebServiceRequest input)
         public IRequest Marshall(GetBucketMetadataConfigurationRequest publicRequest)
         {
             var request = new DefaultRequest(publicRequest, "Amazon.S3");
+            PreMarshallCustomization(request, publicRequest);
             request.HttpMethod = "GET";
             request.AddSubResource("metadataConfiguration");
         
@@ -65,10 +66,9 @@ public IRequest Marshall(GetBucketMetadataConfigurationRequest publicRequest)
             }
             if (!publicRequest.IsSetBucketName())
                 throw new AmazonS3Exception("Request object does not have required field BucketName set");
-            request.AddPathResource("{Bucket}", StringUtils.FromString(publicRequest.BucketName));
-            request.ResourcePath = "/{Bucket}";
-
+            request.ResourcePath = "/";
 
+            PostMarshallCustomization(request, publicRequest);
             return request;
         }
         private static GetBucketMetadataConfigurationRequestMarshaller _instance = new GetBucketMetadataConfigurationRequestMarshaller();        
@@ -89,5 +89,7 @@ public static GetBucketMetadataConfigurationRequestMarshaller Instance
             }
         }
 
+        partial void PostMarshallCustomization(DefaultRequest defaultRequest, GetBucketMetadataConfigurationRequest publicRequest);
+        partial void PreMarshallCustomization(DefaultRequest defaultRequest, GetBucketMetadataConfigurationRequest publicRequest);
     }    
 }
\ No newline at end of file
diff --git a/sdk/src/Services/S3/Custom/Model/Internal/MarshallTransformations/GetBucketMetadataConfigurationResponseUnmarshaller.cs b/sdk/src/Services/S3/Generated/Model/Internal/MarshallTransformations/GetBucketMetadataConfigurationResponseUnmarshaller.cs
similarity index 86%
rename from sdk/src/Services/S3/Custom/Model/Internal/MarshallTransformations/GetBucketMetadataConfigurationResponseUnmarshaller.cs
rename to sdk/src/Services/S3/Generated/Model/Internal/MarshallTransformations/GetBucketMetadataConfigurationResponseUnmarshaller.cs
index 8487718789c4..e478553fde29 100644
--- a/sdk/src/Services/S3/Custom/Model/Internal/MarshallTransformations/GetBucketMetadataConfigurationResponseUnmarshaller.cs
+++ b/sdk/src/Services/S3/Generated/Model/Internal/MarshallTransformations/GetBucketMetadataConfigurationResponseUnmarshaller.cs
@@ -36,7 +36,7 @@ namespace Amazon.S3.Model.Internal.MarshallTransformations
     /// <summary>
     /// Response Unmarshaller for GetBucketMetadataConfiguration operation
     /// </summary>  
-    public class GetBucketMetadataConfigurationResponseUnmarshaller : S3ReponseUnmarshaller
+    public partial class GetBucketMetadataConfigurationResponseUnmarshaller : S3ReponseUnmarshaller
     {
         /// <summary>
         /// Unmarshaller the response from the service to the response class.
@@ -48,6 +48,7 @@ public override AmazonWebServiceResponse Unmarshall(XmlUnmarshallerContext conte
             GetBucketMetadataConfigurationResponse response = new GetBucketMetadataConfigurationResponse();
             UnmarshallResult(context,response);
             
+            PostUnmarshallCustomization(context, response);
             return response;
         }        
 
@@ -75,7 +76,6 @@ private static void UnmarshallResult(XmlUnmarshallerContext context, GetBucketMe
                     return;
                 }
             }
-          
             return;
         }
   
@@ -89,7 +89,7 @@ private static void UnmarshallResult(XmlUnmarshallerContext context, GetBucketMe
         /// <returns></returns>
         public override AmazonServiceException UnmarshallException(XmlUnmarshallerContext context, Exception innerException, HttpStatusCode statusCode)
         {
-            var errorResponse = S3ErrorResponseUnmarshaller.Instance.Unmarshall(context);
+            S3ErrorResponse errorResponse = S3ErrorResponseUnmarshaller.Instance.Unmarshall(context);
             errorResponse.InnerException = innerException;
             errorResponse.StatusCode = statusCode;
 
@@ -99,11 +99,17 @@ public override AmazonServiceException UnmarshallException(XmlUnmarshallerContex
             using (var contextCopy = new XmlUnmarshallerContext(streamCopy, false, null))
             {
             }
-            return new AmazonS3Exception(errorResponse.Message, innerException, errorResponse.Type, errorResponse.Code, errorResponse.RequestId, statusCode);
+            return base.ConstructS3Exception(context, errorResponse, innerException, statusCode);
         }
 
+        partial void PostUnmarshallCustomization(XmlUnmarshallerContext context, GetBucketMetadataConfigurationResponse response);
+
         private static GetBucketMetadataConfigurationResponseUnmarshaller _instance = new GetBucketMetadataConfigurationResponseUnmarshaller();        
 
+        internal static GetBucketMetadataConfigurationResponseUnmarshaller GetInstance()
+        {
+            return _instance;
+        }
 
         /// <summary>
         /// Gets the singleton.
diff --git a/sdk/src/Services/S3/Custom/Model/Internal/MarshallTransformations/GetBucketMetadataConfigurationResultUnmarshaller.cs b/sdk/src/Services/S3/Generated/Model/Internal/MarshallTransformations/GetBucketMetadataConfigurationResultUnmarshaller.cs
similarity index 87%
rename from sdk/src/Services/S3/Custom/Model/Internal/MarshallTransformations/GetBucketMetadataConfigurationResultUnmarshaller.cs
rename to sdk/src/Services/S3/Generated/Model/Internal/MarshallTransformations/GetBucketMetadataConfigurationResultUnmarshaller.cs
index 9070a84d6bec..85ac1458d169 100644
--- a/sdk/src/Services/S3/Custom/Model/Internal/MarshallTransformations/GetBucketMetadataConfigurationResultUnmarshaller.cs
+++ b/sdk/src/Services/S3/Generated/Model/Internal/MarshallTransformations/GetBucketMetadataConfigurationResultUnmarshaller.cs
@@ -36,7 +36,7 @@ namespace Amazon.S3.Model.Internal.MarshallTransformations
     /// <summary>
     /// Response Unmarshaller for GetBucketMetadataConfigurationResult Object
     /// </summary>  
-    public class GetBucketMetadataConfigurationResultUnmarshaller : IXmlUnmarshaller<GetBucketMetadataConfigurationResult, XmlUnmarshallerContext>
+    public partial class GetBucketMetadataConfigurationResultUnmarshaller : IXmlUnmarshaller<GetBucketMetadataConfigurationResult, XmlUnmarshallerContext>
     {
         /// <summary>
         /// Unmarshaller the response from the service to the response class.
@@ -62,6 +62,8 @@ public GetBucketMetadataConfigurationResult Unmarshall(XmlUnmarshallerContext co
                         unmarshalledObject.MetadataConfigurationResult = unmarshaller.Unmarshall(context);
                         continue;
                     }
+
+                    XmlStructureUnmarshallCustomization(context, unmarshalledObject, targetDepth);
                 }
                 else if (context.IsEndElement && context.CurrentDepth < originalDepth)
                 {
@@ -71,6 +73,8 @@ public GetBucketMetadataConfigurationResult Unmarshall(XmlUnmarshallerContext co
             return unmarshalledObject;
         }
 
+        partial void XmlStructureUnmarshallCustomization(XmlUnmarshallerContext context, GetBucketMetadataConfigurationResult unmarshalledObject, int targetDepth);
+
         private static GetBucketMetadataConfigurationResultUnmarshaller _instance = new GetBucketMetadataConfigurationResultUnmarshaller();        
 
         /// <summary>
diff --git a/sdk/src/Services/S3/Custom/Model/Internal/MarshallTransformations/InventoryTableConfigurationResultUnmarshaller.cs b/sdk/src/Services/S3/Generated/Model/Internal/MarshallTransformations/InventoryTableConfigurationResultUnmarshaller.cs
similarity index 89%
rename from sdk/src/Services/S3/Custom/Model/Internal/MarshallTransformations/InventoryTableConfigurationResultUnmarshaller.cs
rename to sdk/src/Services/S3/Generated/Model/Internal/MarshallTransformations/InventoryTableConfigurationResultUnmarshaller.cs
index 7f4861a09f84..bd95aec719a4 100644
--- a/sdk/src/Services/S3/Custom/Model/Internal/MarshallTransformations/InventoryTableConfigurationResultUnmarshaller.cs
+++ b/sdk/src/Services/S3/Generated/Model/Internal/MarshallTransformations/InventoryTableConfigurationResultUnmarshaller.cs
@@ -36,7 +36,7 @@ namespace Amazon.S3.Model.Internal.MarshallTransformations
     /// <summary>
     /// Response Unmarshaller for InventoryTableConfigurationResult Object
     /// </summary>  
-    public class InventoryTableConfigurationResultUnmarshaller : IXmlUnmarshaller<InventoryTableConfigurationResult, XmlUnmarshallerContext>
+    public partial class InventoryTableConfigurationResultUnmarshaller : IXmlUnmarshaller<InventoryTableConfigurationResult, XmlUnmarshallerContext>
     {
         /// <summary>
         /// Unmarshaller the response from the service to the response class.
@@ -64,7 +64,7 @@ public InventoryTableConfigurationResult Unmarshall(XmlUnmarshallerContext conte
                     }
                     if (context.TestExpression("Error", targetDepth))
                     {
-                        var unmarshaller = ErrorUnmarshaller.Instance;
+                        var unmarshaller = ErrorDetailsUnmarshaller.Instance;
                         unmarshalledObject.Error = unmarshaller.Unmarshall(context);
                         continue;
                     }
@@ -86,6 +86,8 @@ public InventoryTableConfigurationResult Unmarshall(XmlUnmarshallerContext conte
                         unmarshalledObject.TableStatus = unmarshaller.Unmarshall(context);
                         continue;
                     }
+
+                    XmlStructureUnmarshallCustomization(context, unmarshalledObject, targetDepth);
                 }
                 else if (context.IsEndElement && context.CurrentDepth < originalDepth)
                 {
@@ -95,6 +97,8 @@ public InventoryTableConfigurationResult Unmarshall(XmlUnmarshallerContext conte
             return unmarshalledObject;
         }
 
+        partial void XmlStructureUnmarshallCustomization(XmlUnmarshallerContext context, InventoryTableConfigurationResult unmarshalledObject, int targetDepth);
+
         private static InventoryTableConfigurationResultUnmarshaller _instance = new InventoryTableConfigurationResultUnmarshaller();        
 
         /// <summary>
diff --git a/sdk/src/Services/S3/Custom/Model/Internal/MarshallTransformations/JournalTableConfigurationResultUnmarshaller.cs b/sdk/src/Services/S3/Generated/Model/Internal/MarshallTransformations/JournalTableConfigurationResultUnmarshaller.cs
similarity index 89%
rename from sdk/src/Services/S3/Custom/Model/Internal/MarshallTransformations/JournalTableConfigurationResultUnmarshaller.cs
rename to sdk/src/Services/S3/Generated/Model/Internal/MarshallTransformations/JournalTableConfigurationResultUnmarshaller.cs
index bb8a8b7574f2..db022b7f3515 100644
--- a/sdk/src/Services/S3/Custom/Model/Internal/MarshallTransformations/JournalTableConfigurationResultUnmarshaller.cs
+++ b/sdk/src/Services/S3/Generated/Model/Internal/MarshallTransformations/JournalTableConfigurationResultUnmarshaller.cs
@@ -36,7 +36,7 @@ namespace Amazon.S3.Model.Internal.MarshallTransformations
     /// <summary>
     /// Response Unmarshaller for JournalTableConfigurationResult Object
     /// </summary>  
-    public class JournalTableConfigurationResultUnmarshaller : IXmlUnmarshaller<JournalTableConfigurationResult, XmlUnmarshallerContext>
+    public partial class JournalTableConfigurationResultUnmarshaller : IXmlUnmarshaller<JournalTableConfigurationResult, XmlUnmarshallerContext>
     {
         /// <summary>
         /// Unmarshaller the response from the service to the response class.
@@ -58,7 +58,7 @@ public JournalTableConfigurationResult Unmarshall(XmlUnmarshallerContext context
                 {
                     if (context.TestExpression("Error", targetDepth))
                     {
-                        var unmarshaller = ErrorUnmarshaller.Instance;
+                        var unmarshaller = ErrorDetailsUnmarshaller.Instance;
                         unmarshalledObject.Error = unmarshaller.Unmarshall(context);
                         continue;
                     }
@@ -86,6 +86,8 @@ public JournalTableConfigurationResult Unmarshall(XmlUnmarshallerContext context
                         unmarshalledObject.TableStatus = unmarshaller.Unmarshall(context);
                         continue;
                     }
+
+                    XmlStructureUnmarshallCustomization(context, unmarshalledObject, targetDepth);
                 }
                 else if (context.IsEndElement && context.CurrentDepth < originalDepth)
                 {
@@ -95,6 +97,8 @@ public JournalTableConfigurationResult Unmarshall(XmlUnmarshallerContext context
             return unmarshalledObject;
         }
 
+        partial void XmlStructureUnmarshallCustomization(XmlUnmarshallerContext context, JournalTableConfigurationResult unmarshalledObject, int targetDepth);
+
         private static JournalTableConfigurationResultUnmarshaller _instance = new JournalTableConfigurationResultUnmarshaller();        
 
         /// <summary>
diff --git a/sdk/src/Services/S3/Custom/Model/Internal/MarshallTransformations/MetadataConfigurationResultUnmarshaller.cs b/sdk/src/Services/S3/Generated/Model/Internal/MarshallTransformations/MetadataConfigurationResultUnmarshaller.cs
similarity index 90%
rename from sdk/src/Services/S3/Custom/Model/Internal/MarshallTransformations/MetadataConfigurationResultUnmarshaller.cs
rename to sdk/src/Services/S3/Generated/Model/Internal/MarshallTransformations/MetadataConfigurationResultUnmarshaller.cs
index 3729d5e402ec..ffec2c53303d 100644
--- a/sdk/src/Services/S3/Custom/Model/Internal/MarshallTransformations/MetadataConfigurationResultUnmarshaller.cs
+++ b/sdk/src/Services/S3/Generated/Model/Internal/MarshallTransformations/MetadataConfigurationResultUnmarshaller.cs
@@ -36,7 +36,7 @@ namespace Amazon.S3.Model.Internal.MarshallTransformations
     /// <summary>
     /// Response Unmarshaller for MetadataConfigurationResult Object
     /// </summary>  
-    public class MetadataConfigurationResultUnmarshaller : IXmlUnmarshaller<MetadataConfigurationResult, XmlUnmarshallerContext>
+    public partial class MetadataConfigurationResultUnmarshaller : IXmlUnmarshaller<MetadataConfigurationResult, XmlUnmarshallerContext>
     {
         /// <summary>
         /// Unmarshaller the response from the service to the response class.
@@ -74,6 +74,8 @@ public MetadataConfigurationResult Unmarshall(XmlUnmarshallerContext context)
                         unmarshalledObject.JournalTableConfigurationResult = unmarshaller.Unmarshall(context);
                         continue;
                     }
+
+                    XmlStructureUnmarshallCustomization(context, unmarshalledObject, targetDepth);
                 }
                 else if (context.IsEndElement && context.CurrentDepth < originalDepth)
                 {
@@ -83,6 +85,8 @@ public MetadataConfigurationResult Unmarshall(XmlUnmarshallerContext context)
             return unmarshalledObject;
         }
 
+        partial void XmlStructureUnmarshallCustomization(XmlUnmarshallerContext context, MetadataConfigurationResult unmarshalledObject, int targetDepth);
+
         private static MetadataConfigurationResultUnmarshaller _instance = new MetadataConfigurationResultUnmarshaller();        
 
         /// <summary>
diff --git a/sdk/src/Services/S3/Custom/Model/Internal/MarshallTransformations/RecordExpirationUnmarshaller.cs b/sdk/src/Services/S3/Generated/Model/Internal/MarshallTransformations/RecordExpirationUnmarshaller.cs
similarity index 87%
rename from sdk/src/Services/S3/Custom/Model/Internal/MarshallTransformations/RecordExpirationUnmarshaller.cs
rename to sdk/src/Services/S3/Generated/Model/Internal/MarshallTransformations/RecordExpirationUnmarshaller.cs
index dab2c5232742..cc584bbe5bc2 100644
--- a/sdk/src/Services/S3/Custom/Model/Internal/MarshallTransformations/RecordExpirationUnmarshaller.cs
+++ b/sdk/src/Services/S3/Generated/Model/Internal/MarshallTransformations/RecordExpirationUnmarshaller.cs
@@ -36,7 +36,7 @@ namespace Amazon.S3.Model.Internal.MarshallTransformations
     /// <summary>
     /// Response Unmarshaller for RecordExpiration Object
     /// </summary>  
-    public class RecordExpirationUnmarshaller : IXmlUnmarshaller<RecordExpiration, XmlUnmarshallerContext>
+    public partial class RecordExpirationUnmarshaller : IXmlUnmarshaller<RecordExpiration, XmlUnmarshallerContext>
     {
         /// <summary>
         /// Unmarshaller the response from the service to the response class.
@@ -58,7 +58,7 @@ public RecordExpiration Unmarshall(XmlUnmarshallerContext context)
                 {
                     if (context.TestExpression("Days", targetDepth))
                     {
-                        var unmarshaller = IntUnmarshaller.Instance;
+                        var unmarshaller = NullableIntUnmarshaller.Instance;
                         unmarshalledObject.Days = unmarshaller.Unmarshall(context);
                         continue;
                     }
@@ -68,6 +68,8 @@ public RecordExpiration Unmarshall(XmlUnmarshallerContext context)
                         unmarshalledObject.Expiration = unmarshaller.Unmarshall(context);
                         continue;
                     }
+
+                    XmlStructureUnmarshallCustomization(context, unmarshalledObject, targetDepth);
                 }
                 else if (context.IsEndElement && context.CurrentDepth < originalDepth)
                 {
@@ -77,6 +79,8 @@ public RecordExpiration Unmarshall(XmlUnmarshallerContext context)
             return unmarshalledObject;
         }
 
+        partial void XmlStructureUnmarshallCustomization(XmlUnmarshallerContext context, RecordExpiration unmarshalledObject, int targetDepth);
+
         private static RecordExpirationUnmarshaller _instance = new RecordExpirationUnmarshaller();        
 
         /// <summary>
diff --git a/sdk/src/Services/S3/Custom/Model/InventoryTableConfigurationResult.cs b/sdk/src/Services/S3/Generated/Model/InventoryTableConfigurationResult.cs
similarity index 82%
rename from sdk/src/Services/S3/Custom/Model/InventoryTableConfigurationResult.cs
rename to sdk/src/Services/S3/Generated/Model/InventoryTableConfigurationResult.cs
index 4c927f40870d..17ad46b5e5d9 100644
--- a/sdk/src/Services/S3/Custom/Model/InventoryTableConfigurationResult.cs
+++ b/sdk/src/Services/S3/Generated/Model/InventoryTableConfigurationResult.cs
@@ -43,7 +43,8 @@ public partial class InventoryTableConfigurationResult
         /// <summary>
         /// Gets and sets the property ConfigurationState. 
         /// <para>
-        ///  The configuration state of the inventory table, indicating whether the inventory table is enabled or disabled. 
+        ///  The configuration state of the inventory table, indicating whether the inventory
+        /// table is enabled or disabled. 
         /// </para>
         /// </summary>
         [AWSProperty(Required=true)]
@@ -117,19 +118,19 @@ internal bool IsSetTableName()
         /// </para>
         ///  <ul> <li> 
         /// <para>
-        ///  <c>CREATING</c> - The inventory table is in the process of being created in the
-        /// specified Amazon Web Services managed table bucket.
+        ///  <c>CREATING</c> - The inventory table is in the process of being created in the specified
+        /// Amazon Web Services managed table bucket.
         /// </para>
         ///  </li> <li> 
         /// <para>
-        ///  <c>BACKFILLING</c> - The inventory table is in the process of being backfilled.
-        /// When you enable the inventory table for your metadata configuration, the table goes
-        /// through a process known as backfilling, during which Amazon S3 scans your general
-        /// purpose bucket to retrieve the initial metadata for all objects in the bucket. Depending
-        /// on the number of objects in your bucket, this process can take several hours. When
-        /// the backfilling process is finished, the status of your inventory table changes from
-        /// <c>BACKFILLING</c> to <c>ACTIVE</c>. After backfilling is completed, updates to your
-        /// objects are reflected in the inventory table within one hour.
+        ///  <c>BACKFILLING</c> - The inventory table is in the process of being backfilled. When
+        /// you enable the inventory table for your metadata configuration, the table goes through
+        /// a process known as backfilling, during which Amazon S3 scans your general purpose
+        /// bucket to retrieve the initial metadata for all objects in the bucket. Depending on
+        /// the number of objects in your bucket, this process can take several hours. When the
+        /// backfilling process is finished, the status of your inventory table changes from <c>BACKFILLING</c>
+        /// to <c>ACTIVE</c>. After backfilling is completed, updates to your objects are reflected
+        /// in the inventory table within one hour.
         /// </para>
         ///  </li> <li> 
         /// <para>
@@ -138,10 +139,10 @@ internal bool IsSetTableName()
         /// </para>
         ///  </li> <li> 
         /// <para>
-        ///  <c>FAILED</c> - Amazon S3 is unable to create the inventory table, or Amazon S3
-        /// is unable to deliver records.
+        ///  <c>FAILED</c> - Amazon S3 is unable to create the inventory table, or Amazon S3 is
+        /// unable to deliver records.
         /// </para>
-        ///  </li> </ul> 
+        ///  </li> </ul>
         /// </summary>
         public string TableStatus
         {
diff --git a/sdk/src/Services/S3/Custom/Model/JournalTableConfigurationResult.cs b/sdk/src/Services/S3/Generated/Model/JournalTableConfigurationResult.cs
similarity index 99%
rename from sdk/src/Services/S3/Custom/Model/JournalTableConfigurationResult.cs
rename to sdk/src/Services/S3/Generated/Model/JournalTableConfigurationResult.cs
index 85c7483d7423..ca2c65dda3e2 100644
--- a/sdk/src/Services/S3/Custom/Model/JournalTableConfigurationResult.cs
+++ b/sdk/src/Services/S3/Generated/Model/JournalTableConfigurationResult.cs
@@ -131,7 +131,7 @@ internal bool IsSetTableName()
         ///  <c>FAILED</c> - Amazon S3 is unable to create the journal table, or Amazon S3 is
         /// unable to deliver records.
         /// </para>
-        ///  </li> </ul> 
+        ///  </li> </ul>
         /// </summary>
         [AWSProperty(Required=true)]
         public string TableStatus
diff --git a/sdk/src/Services/S3/Custom/Model/MetadataConfigurationResult.cs b/sdk/src/Services/S3/Generated/Model/MetadataConfigurationResult.cs
similarity index 100%
rename from sdk/src/Services/S3/Custom/Model/MetadataConfigurationResult.cs
rename to sdk/src/Services/S3/Generated/Model/MetadataConfigurationResult.cs